diff --git a/lib/marriage_abroad_outcome_flattener.rb b/lib/marriage_abroad_outcome_flattener.rb
index 78e28c0f2d7..a6c5bc6a027 100644
--- a/lib/marriage_abroad_outcome_flattener.rb
+++ b/lib/marriage_abroad_outcome_flattener.rb
@@ -39,7 +39,7 @@ def generate_and_add_partials_to_country_files
raise "Failed to load `#{route}`" unless app.get(route) == 200
body = app.response.body
- template_path = "#{country_outcome_path(responses_path)}.govspeak.erb"
+ template_path = "#{country_outcome_path(responses_path)}.erb"
responses_directory = File.dirname(template_path)
FileUtils.mkdir_p(responses_directory) unless File.directory?(responses_directory)
@@ -51,7 +51,7 @@ def generate_and_add_partials_to_country_files
File.write(template_path, insert_payment_partials(lines.join("\n")) + "\n")
end
- File.write("#{country_partials_dir}/_title.govspeak.erb", title_contents(titles))
+ File.write("#{country_partials_dir}/_title.erb", title_contents(titles))
end
# Strips the first two lines of the file (the title).
@@ -75,7 +75,7 @@ def replace_how_to_pay(text)
text.gsub(
/^\^?You can( only)? pay by.*?\n.*?^$/mi,
<<~HOW_TO_PAY.freeze,
- <%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+ <%= render partial: 'how_to_pay.erb', locals: {calculator: calculator} %>
HOW_TO_PAY
)
end
@@ -84,7 +84,7 @@ def replace_fee_table(text)
text.gsub(
/^Service \| Fee\n.*?^$/mi,
<<~FEE_TABLE.freeze,
- <%= render partial: 'consular_fees_table_items.govspeak.erb',
+ <%= render partial: 'consular_fees_table_items.erb',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
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
new file mode 100644
index 00000000000..cbe39008455
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Look up Meursing code
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Use this tool to look up the additional code (Meursing code) for import or export of goods containing certain types of milk and sugars covered Regulation (EC) No. 118/2010.
+<% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.govspeak.erb
deleted file mode 100644
index 133bcd10559..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Look up Meursing code
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Use this tool to look up the additional code (Meursing code) for import or export of goods containing certain types of milk and sugars covered Regulation (EC) No. 118/2010.
-<% 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
new file mode 100644
index 00000000000..4f919df4f92
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ <% unless calculator.has_commodity_code? %>
+ The product composition you indicated is not possible.
+ <% else %>
+ The Meursing code for a product with this composition is 7<%= calculator.commodity_code %>.
+ <% end %>
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if calculator.has_commodity_code? %>
+ Use these four digits together with the ten-digit commodity code from [Trade Tariff](/trade-tariff).
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.govspeak.erb
deleted file mode 100644
index 7a5b0298150..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- <% unless calculator.has_commodity_code? %>
- The product composition you indicated is not possible.
- <% else %>
- The Meursing code for a product with this composition is 7<%= calculator.commodity_code %>.
- <% end %>
-<% end %>
-
-<% render_content_for :body do %>
- <% if calculator.has_commodity_code? %>
- Use these four digits together with the ten-digit commodity code from [Trade Tariff](/trade-tariff).
- <% end %>
-<% end %>
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
new file mode 100644
index 00000000000..b862ea0e806
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.erb
@@ -0,0 +1,22 @@
+<% text_for :title do %>
+ How much milk fat does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 1.49",
+ "1": "1.5 - 2.99",
+ "3": "3 - 5.99",
+ "6": "6 - 8.99",
+ "9": "9 - 11.99",
+ "12": "12 - 17.99",
+ "18": "18 - 25.99",
+ "26": "26 - 39.99",
+ "40": "40 - 54.99",
+ "55": "55 - 69.99",
+ "70": "70 - 84.99",
+ "85": "85 or more"
+) %>
+
+<% text_for :hint do %>
+ The values represent % by weight
+<% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.govspeak.erb
deleted file mode 100644
index 122c5a7805f..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.govspeak.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% render_content_for :title do %>
- How much milk fat does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 1.49",
- "1": "1.5 - 2.99",
- "3": "3 - 5.99",
- "6": "6 - 8.99",
- "9": "9 - 11.99",
- "12": "12 - 17.99",
- "18": "18 - 25.99",
- "26": "26 - 39.99",
- "40": "40 - 54.99",
- "55": "55 - 69.99",
- "70": "70 - 84.99",
- "85": "85 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..3cdcb9e5439
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ How much milk proteins does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 2.49",
+ "2": "2.5 - 5.99",
+ "6": "6 - 17.99",
+ "18": "18 - 29.99",
+ "30": "30 - 59.99",
+ "60": "60 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.govspeak.erb
deleted file mode 100644
index b8c4b0fbf6a..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- How much milk proteins does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 2.49",
- "2": "2.5 - 5.99",
- "6": "6 - 17.99",
- "18": "18 - 29.99",
- "30": "30 - 59.99",
- "60": "60 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..7edb24ee969
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How much milk proteins does the product contain?
+<% end %>
+
+<% options(
+ "0": "0-2.49",
+ "2": "2.5-11.99",
+ "12": "12 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.govspeak.erb
deleted file mode 100644
index 4545289c4e0..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How much milk proteins does the product contain?
-<% end %>
-
-<% options(
- "0": "0-2.49",
- "2": "2.5-11.99",
- "12": "12 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a0d6588b8c1
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How much milk proteins does the product contain?
+<% end %>
+
+<% options(
+ "0": "0-3.99",
+ "4": "4-14.99",
+ "15": "15 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.govspeak.erb
deleted file mode 100644
index 846d72ea88f..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How much milk proteins does the product contain?
-<% end %>
-
-<% options(
- "0": "0-3.99",
- "4": "4-14.99",
- "15": "15 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..55f6ab7aadf
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How much milk proteins does the product contain?
+<% end %>
+
+<% options(
+ "0": "0-5.99",
+ "6": "6-17.99",
+ "18": "18 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.govspeak.erb
deleted file mode 100644
index 01e7cb1f73e..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How much milk proteins does the product contain?
-<% end %>
-
-<% options(
- "0": "0-5.99",
- "6": "6-17.99",
- "18": "18 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..964e6e02311
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ How much milk proteins does the product contain?
+<% end %>
+
+<% options(
+ "0": "0-5.99",
+ "6": "6 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.govspeak.erb
deleted file mode 100644
index 6b5e2f85a33..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- How much milk proteins does the product contain?
-<% end %>
-
-<% options(
- "0": "0-5.99",
- "6": "6 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..bd88d546839
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ How much starch or glucose does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 4.99",
+ "5": "5 - 24.99",
+ "25": "25 - 49.99",
+ "50": "50 - 74.99",
+ "75": "75 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.govspeak.erb
deleted file mode 100644
index 29db044abe7..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- How much starch or glucose does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 4.99",
- "5": "5 - 24.99",
- "25": "25 - 49.99",
- "50": "50 - 74.99",
- "75": "75 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..e726b8fdd80
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ How much sucrose, invert sugar or isoglucose does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 4.99",
+ "5": "5 - 29.99",
+ "30": "30 - 49.99",
+ "50": "50 - 69.99",
+ "70": "70 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.govspeak.erb
deleted file mode 100644
index 2bc5e824cc2..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- How much sucrose, invert sugar or isoglucose does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 4.99",
- "5": "5 - 29.99",
- "30": "30 - 49.99",
- "50": "50 - 69.99",
- "70": "70 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..c9489e68409
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How much sucrose, invert sugar or isoglucose does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 4.99",
+ "5": "5 - 29.99",
+ "30": "30 - 49.99",
+ "50": "50 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.govspeak.erb
deleted file mode 100644
index 0ea3bc76381..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How much sucrose, invert sugar or isoglucose does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 4.99",
- "5": "5 - 29.99",
- "30": "30 - 49.99",
- "50": "50 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..318fbdf8ed2
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How much sucrose, invert sugar or isoglucose does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 4.99",
+ "5": "5 - 29.99",
+ "30": "30 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.govspeak.erb
deleted file mode 100644
index a101a065d40..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How much sucrose, invert sugar or isoglucose does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 4.99",
- "5": "5 - 29.99",
- "30": "30 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..cce2137b6c2
--- /dev/null
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ How much sucrose, invert sugar or isoglucose does the product contain?
+<% end %>
+
+<% options(
+ "0": "0 - 4.99",
+ "5": "5 or more"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.govspeak.erb
deleted file mode 100644
index dc68519bca4..00000000000
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- How much sucrose, invert sugar or isoglucose does the product contain?
-<% end %>
-
-<% options(
- "0": "0 - 4.99",
- "5": "5 or more"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..9163f845b2f
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ National Minimum Wage and Living Wage calculator for workers
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Check if:
+
+ - you’re getting paid the National Minimum Wage
+ - you’re getting paid the National Living Wage
+ - your employer owes you past payments from the previous year because of underpayment
+
+ ^You must be at least 25 years old to get the National Living Wage.^
+
+ Check [National Minimum Wage and National Living Wage rates](/national-minimum-wage-rates) before March 2019.
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb
deleted file mode 100644
index 7d5831946d6..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- National Minimum Wage and Living Wage calculator for workers
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Check if:
-
- - you’re getting paid the National Minimum Wage
- - you’re getting paid the National Living Wage
- - your employer owes you past payments from the previous year because of underpayment
-
- ^You must be at least 25 years old to get the National Living Wage.^
-
- Check [National Minimum Wage and National Living Wage rates](/national-minimum-wage-rates) before March 2019.
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.erb
new file mode 100644
index 00000000000..aae45c0d9a9
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.erb
@@ -0,0 +1,21 @@
+<% govspeak_for :body do %>
+ $C
+ <% if calculator.eligible_for_living_wage? %>
+ Based on your answers, you appear to be getting the National Living Wage.
+ <% else %>
+ Based on your answers, you appear to be getting the National Minimum Wage.
+ <% end %>
+ $C
+
+ <% if calculator.potential_underpayment? %>
+ If you have had money taken from your pay for things you need for your job or not been paid for any additional time you work outside of your shift you might have been underpaid. You can contact Acas or make a complaint to HMRC.
+ <% else %>
+ Read the guidance on the [National Minimum Wage](/national-minimum-wage) and [how the National Minimum Wage is calculated](/minimum-wage-different-types-work).
+ <% end %>
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+
+ <% if calculator.potential_underpayment? %>
+ You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb
deleted file mode 100644
index 362b2a801e0..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :body do %>
- $C
- <% if calculator.eligible_for_living_wage? %>
- Based on your answers, you appear to be getting the National Living Wage.
- <% else %>
- Based on your answers, you appear to be getting the National Minimum Wage.
- <% end %>
- $C
-
- <% if calculator.potential_underpayment? %>
- If you have had money taken from your pay for things you need for your job or not been paid for any additional time you work outside of your shift you might have been underpaid. You can contact Acas or make a complaint to HMRC.
- <% else %>
- Read the guidance on the [National Minimum Wage](/national-minimum-wage) and [how the National Minimum Wage is calculated](/minimum-wage-different-types-work).
- <% end %>
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-
- <% if calculator.potential_underpayment? %>
- You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.erb
new file mode 100644
index 00000000000..56286b0bf81
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.erb
@@ -0,0 +1,22 @@
+<% govspeak_for :body do %>
+ $C
+ <% if calculator.eligible_for_living_wage? %>
+ Based on your answers, you appear to be not getting the National Living Wage.
+ <% else %>
+ Based on your answers, you appear to be not getting the National Minimum Wage.
+ <% end %>
+ $C
+
+ This is because you are not being paid the [minimum rate](/national-minimum-wage-rates) you are entitled to.
+
+ <% if calculator.potential_underpayment? %>
+ You could have also:
+
+ * had money taken from your pay for things you need for your job
+ * not been paid for any additional time you work outside of your shift
+ <% end %>
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+
+ You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb
deleted file mode 100644
index 7f8cd6b86d2..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% render_content_for :body do %>
- $C
- <% if calculator.eligible_for_living_wage? %>
- Based on your answers, you appear to be not getting the National Living Wage.
- <% else %>
- Based on your answers, you appear to be not getting the National Minimum Wage.
- <% end %>
- $C
-
- This is because you are not being paid the [minimum rate](/national-minimum-wage-rates) you are entitled to.
-
- <% if calculator.potential_underpayment? %>
- You could have also:
-
- * had money taken from your pay for things you need for your job
- * not been paid for any additional time you work outside of your shift
- <% end %>
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-
- You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.erb
new file mode 100644
index 00000000000..f202e4af608
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ $C
+ Based on your answers, you appear to have been getting the National Minimum Wage.
+ $C
+
+ <% if calculator.potential_underpayment? %>
+ If you had money taken from your pay for things you need for your job or not been paid for any additional time you work outside of your shift you might have been underpaid. You can contact Acas or make a complaint to HMRC.
+ <% else %>
+ Read the guidance on the [National Minimum Wage](/national-minimum-wage) and [how the National Minimum Wage is calculated](/minimum-wage-different-types-work).
+ <% end%>
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+
+ <% if calculator.potential_underpayment? %>
+ You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
+ <% end%>
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb
deleted file mode 100644
index 82c0d716e1a..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- $C
- Based on your answers, you appear to have been getting the National Minimum Wage.
- $C
-
- <% if calculator.potential_underpayment? %>
- If you had money taken from your pay for things you need for your job or not been paid for any additional time you work outside of your shift you might have been underpaid. You can contact Acas or make a complaint to HMRC.
- <% else %>
- Read the guidance on the [National Minimum Wage](/national-minimum-wage) and [how the National Minimum Wage is calculated](/minimum-wage-different-types-work).
- <% end%>
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-
- <% if calculator.potential_underpayment? %>
- You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
- <% end%>
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.erb
new file mode 100644
index 00000000000..e0c6f7b91e1
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ $C
+ Based on your answers, you appear to have not been getting the National Minimum Wage.
+ $C
+
+ This is because you were not being paid the [minimum rate](/national-minimum-wage-rates) you are entitled to.
+
+ <% if calculator.potential_underpayment? %>
+ You could have also:
+
+ * had money taken from your pay for things you needed for your job
+ * not been paid for any additional time you worked outside of your shift
+ <% end %>
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+
+ You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb
deleted file mode 100644
index 7331f94f973..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- $C
- Based on your answers, you appear to have not been getting the National Minimum Wage.
- $C
-
- This is because you were not being paid the [minimum rate](/national-minimum-wage-rates) you are entitled to.
-
- <% if calculator.potential_underpayment? %>
- You could have also:
-
- * had money taken from your pay for things you needed for your job
- * not been paid for any additional time you worked outside of your shift
- <% end %>
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-
- You can also [make a complaint to HM Revenue and Customs (HMRC)](/government/publications/pay-and-work-rights-complaints) about your employer or employment agency or complain on behalf of someone else.
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.erb
new file mode 100644
index 00000000000..7c2d9fc18a0
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You must be at least [school leaving age](/know-when-you-can-leave-school) to be entitled to the National Minimum Wage.
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.govspeak.erb
deleted file mode 100644
index 579126a3bdd..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You must be at least [school leaving age](/know-when-you-can-leave-school) to be entitled to the National Minimum Wage.
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.erb
new file mode 100644
index 00000000000..a594cd7f197
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You must have been at least [school leaving age](/know-when-you-can-leave-school) at the time to be entitled to the National Minimum Wage.
+<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.govspeak.erb
deleted file mode 100644
index fdb257a220f..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You must have been at least [school leaving age](/know-when-you-can-leave-school) at the time to be entitled to the National Minimum Wage.
-<% 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
new file mode 100644
index 00000000000..7d51a2a857f
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Are you an apprentice?
+<% end %>
+
+<% options(
+ "not_an_apprentice": "Not an apprentice",
+ "apprentice_under_19": "Apprentice under 19",
+ "apprentice_over_19_first_year": "Apprentice aged 19 and over in your first year",
+ "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in your second year or onwards"
+) %>
+
+<% 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/are_you_an_apprentice.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.govspeak.erb
deleted file mode 100644
index 81f8ce66d45..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Are you an apprentice?
-<% end %>
-
-<% options(
- "not_an_apprentice": "Not an apprentice",
- "apprentice_under_19": "Apprentice under 19",
- "apprentice_over_19_first_year": "Apprentice aged 19 and over in your first year",
- "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in your second year or onwards"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..11744d6e0c1
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much does your employer charge for accommodation per day?
+<% end %>
+
+<% text_for :suffix_label do %>
+ per day
+<% end %>
+
+<% 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_charge.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.govspeak.erb
deleted file mode 100644
index e615cc61799..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much does your employer charge for accommodation per day?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- per day
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..c9a9d503250
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many days per week do you live in the accommodation?
+<% end %>
+
+<% text_for :suffix_label do %>
+ days per week
+<% end %>
+
+<% 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_accommodation_usage.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.govspeak.erb
deleted file mode 100644
index adeaa86cb2d..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many days per week do you live in the accommodation?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- days per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..1fafaed60d6
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do you work additional time outside your shift?
+<% end %>
+
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.govspeak.erb
deleted file mode 100644
index 497551515b2..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do you work additional time outside your shift?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4b2534be0a6
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does your employer pay you for any additional time you work outside of your shift?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.govspeak.erb
deleted file mode 100644
index 346c067966b..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does your employer pay you for any additional time you work outside of your shift?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..f88cbe5bc95
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Did your employer take money from your pay for things you needed for your job?
+<% end %>
+
+<% 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.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.govspeak.erb
deleted file mode 100644
index cdd4fe12472..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Did your employer take money from your pay for things you needed for your job?
-<% end %>
-
-<% render_content_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.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..606e9ccb398
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Does your employer take money from your pay for things you need for your job?
+<% end %>
+
+<% 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.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.govspeak.erb
deleted file mode 100644
index e621093f746..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Does your employer take money from your pay for things you need for your job?
-<% end %>
-
-<% render_content_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.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..2764a778d02
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How many hours did you work during the pay period?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
+<% 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_did_you_work.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.govspeak.erb
deleted file mode 100644
index 3b511c25b4f..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How many hours did you work during the pay period?
-<% end %>
-
-<% render_content_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 %>
- Please enter a number
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..86211046bf5
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How many hours do you work during the pay period?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
+<% 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_many_hours_do_you_work.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.govspeak.erb
deleted file mode 100644
index d7c5e3ad6ba..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How many hours do you work during the pay period?
-<% end %>
-
-<% render_content_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 %>
- Please enter a number
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..e39276965f3
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much do you get paid before tax in the pay period?
+<% end %>
+
+<% text_for :hint do %>
+Do not include payments for overtime or anything extra to your pay, for example money for clothes or goods.
+<% end %>
+
+<% 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_are_you_paid_during_pay_period.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.govspeak.erb
deleted file mode 100644
index 43241c0772b..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much do you get paid before tax in the pay period?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..c5072a5145a
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much were you paid in the pay period?
+<% end %>
+
+<% 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 %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.govspeak.erb
deleted file mode 100644
index 3bc9da0fcb8..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much were you paid in the pay period?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..2576f76e3df
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often did you get paid?
+<% end %>
+
+<% text_for :hint do %>
+ Your pay period in days
+<% end %>
+
+<% 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_did_you_get_paid.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.govspeak.erb
deleted file mode 100644
index 95d347ee026..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often did you get paid?
-<% end %>
-
-<% render_content_for :hint do %>
- Your pay period in days
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..540f8253106
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often do you get paid?
+<% end %>
+
+<% text_for :hint do %>
+ Your pay period in days
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.govspeak.erb
deleted file mode 100644
index a1eb70d7f96..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often do you get paid?
-<% end %>
-
-<% render_content_for :hint do %>
- Your pay period in days
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..f1a4edeeb65
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ <%= age_title %>
+<% end %>
+
+<% text_for :suffix_label do %>
+ years old
+<% end %>
+
+<% text_for :error_message do %>
+ Please enter a whole number greater than 0
+<% end %>
+
+<% 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_are_you.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb
deleted file mode 100644
index c6eb2ae3055..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- <%= age_title %>
-<% end %>
-
-<% render_content_for :suffix_label do %>
- years old
-<% end %>
-
-<% render_content_for :error_message do %>
- Please enter a whole number greater than 0
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..c720e31fa65
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How old were you at the time?
+<% end %>
+
+<% text_for :suffix_label do %>
+ years old
+<% end %>
+
+<% 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/how_old_were_you.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.govspeak.erb
deleted file mode 100644
index 55a1dd77e1e..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How old were you at the time?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- years old
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0db86ad30c8
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Does your employer provide you with accommodation?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes_free": "Yes, the accommodation is free",
+ "yes_charged": "Yes, the accommodation is charged for"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.govspeak.erb
deleted file mode 100644
index 8a3281a40d0..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Does your employer provide you with accommodation?
-<% end %>
-
-<% options(
- "no": "No",
- "yes_free": "Yes, the accommodation is free",
- "yes_charged": "Yes, the accommodation is charged for"
-) %>
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
new file mode 100644
index 00000000000..0e338a344cb
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much did your employer charge for accommodation per day?
+<% end %>
+
+<% text_for :suffix_label do %>
+ per day
+<% end %>
+
+<% 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_charge.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.govspeak.erb
deleted file mode 100644
index 3d1b9368a45..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much did your employer charge for accommodation per day?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- per day
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..8d5dbc1e911
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many days per week did you live in the accommodation?
+<% end %>
+
+<% text_for :suffix_label do %>
+ days per week
+<% end %>
+
+<% 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_accommodation_usage.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.govspeak.erb
deleted file mode 100644
index eceaf2db1d0..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many days per week did you live in the accommodation?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- days per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..376363af015
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Did you work additional time outside your shift?
+<% end %>
+
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.govspeak.erb
deleted file mode 100644
index 577273e16ab..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Did you work additional time outside your shift?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..b76377512ea
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did your employer pay you for any additional time you worked outside of your shift?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.govspeak.erb
deleted file mode 100644
index 8e2a4d57073..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did your employer pay you for any additional time you worked outside of your shift?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..da52e03bd9a
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Did your employer provide you with accommodation?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes_free": "Yes, the accommodation was free",
+ "yes_charged": "Yes, the accommodation was charged for"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.govspeak.erb
deleted file mode 100644
index 414b56e52c1..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Did your employer provide you with accommodation?
-<% end %>
-
-<% options(
- "no": "No",
- "yes_free": "Yes, the accommodation was free",
- "yes_charged": "Yes, the accommodation was charged for"
-) %>
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
new file mode 100644
index 00000000000..77eb75f5d09
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Were you an apprentice at the time?
+<% end %>
+
+<% options(
+ "no": "No",
+ "apprentice_under_19": "Apprentice under 19",
+ "apprentice_over_19": "Apprentice aged 19 and over and in your first year"
+) %>
+
+<% 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/were_you_an_apprentice.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.govspeak.erb
deleted file mode 100644
index f88c18e1bc5..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Were you an apprentice at the time?
-<% end %>
-
-<% options(
- "no": "No",
- "apprentice_under_19": "Apprentice under 19",
- "apprentice_over_19": "Apprentice aged 19 and over and in your first year"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..23f039729b5
--- /dev/null
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ What would you like to check?
+<% end %>
+
+<% options(
+ "current_payment": "If you're getting the National Minimum Wage or the National Living Wage",
+ "past_payment": "If an employer owes you payments from last year (April 2019 to March 2020)"
+) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb
deleted file mode 100644
index 6b4e1fdb14a..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- What would you like to check?
-<% end %>
-
-<% options(
- "current_payment": "If you're getting the National Minimum Wage or the National Living Wage",
- "past_payment": "If an employer owes you payments from last year (April 2019 to March 2020)"
-) %>
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
new file mode 100644
index 00000000000..9121cebd504
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.erb
@@ -0,0 +1,20 @@
+<% text_for :title do %>
+ Benefit cap calculator
+<% end %>
+
+<% text_for :meta_description do %>
+ You can calculate if you’re affected by the benefit cap
+<% end %>
+
+<% govspeak_for :body do %>
+
+The [benefit cap](/benefit-cap) limits the total amount of benefit you can get. It applies to most people aged 16 or over who have not reached [State Pension age](/state-pension-age).
+
+ This calculator gives an estimate of how much your benefit might be capped.
+
+ ^You can't check if you're affected by the benefit cap if you're claiming [Universal Credit](/universal-credit).^
+
+ To use the calculator you’ll need to know the amounts of each benefit you get, and the number of people in your household.
+
+ Your household includes you, your partner and any children that you’re responsible for and who live with you.
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.govspeak.erb
deleted file mode 100644
index 8009d652723..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.govspeak.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<% render_content_for :title do %>
- Benefit cap calculator
-<% end %>
-
-<% render_content_for :meta_description do %>
- You can calculate if you’re affected by the benefit cap
-<% end %>
-
-<% render_content_for :body do %>
-
-The [benefit cap](/benefit-cap) limits the total amount of benefit you can get. It applies to most people aged 16 or over who have not reached [State Pension age](/state-pension-age).
-
- This calculator gives an estimate of how much your benefit might be capped.
-
- ^You can't check if you're affected by the benefit cap if you're claiming [Universal Credit](/universal-credit).^
-
- To use the calculator you’ll need to know the amounts of each benefit you get, and the number of people in your household.
-
- Your household includes you, your partner and any children that you’re responsible for and who live with you.
-<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/_dwp_contact_details.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/_dwp_contact_details.erb
similarity index 100%
rename from lib/smart_answer_flows/benefit-cap-calculator/outcomes/_dwp_contact_details.govspeak.erb
rename to lib/smart_answer_flows/benefit-cap-calculator/outcomes/_dwp_contact_details.erb
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
new file mode 100644
index 00000000000..488efd16743
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.erb
@@ -0,0 +1,35 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
+
+ ##How this is worked out
+
+ The benefits you get are added together. The total amount of benefits over your benefit cap is subtracted from your Housing Benefit:
+
+ Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
+
+ Your Housing Benefit is reduced by the amount you are over your benefit cap of <%= format_money(benefit_cap) %>:
+
+ Total benefits affected: <%= format_money(total_benefits_amount) %>
+
+ Minus benefit cap: <%= format_money(benefit_cap) %>
+
+ Total over cap: <%= format_money(total_over_cap) %>
+
+ Housing benefit: <%= format_money(housing_benefit_amount) %>
+
+ Minus total over cap: <%= format_money(total_over_cap) %>
+
+ New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
+
+ <% if new_housing_benefit_amount < 0.5 %>
+ Your Housing Benefit won’t be reduced to 0. You need to be getting some Housing Benefit to be eligible for other services.
+ <% end %>
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.govspeak.erb
deleted file mode 100644
index 1e6e84ef03d..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.govspeak.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
-
- ##How this is worked out
-
- The benefits you get are added together. The total amount of benefits over your benefit cap is subtracted from your Housing Benefit:
-
- Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
-
- Your Housing Benefit is reduced by the amount you are over your benefit cap of <%= format_money(benefit_cap) %>:
-
- Total benefits affected: <%= format_money(total_benefits_amount) %>
-
- Minus benefit cap: <%= format_money(benefit_cap) %>
-
- Total over cap: <%= format_money(total_over_cap) %>
-
- Housing benefit: <%= format_money(housing_benefit_amount) %>
-
- Minus total over cap: <%= format_money(total_over_cap) %>
-
- New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
-
- <% if new_housing_benefit_amount < 0.5 %>
- Your Housing Benefit won’t be reduced to 0. You need to be getting some Housing Benefit to be eligible for other services.
- <% end %>
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..620ebd5d332
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.erb
@@ -0,0 +1,41 @@
+<% text_for :title do %>
+ Based on your answers, you’re affected by the Greater London benefit cap.
+
+<% end %>
+
+<% govspeak_for :body do %>
+
+ Your weekly benefits | Greater London benefit cap
+ -|-
+ <%= format_money(total_benefits_amount) %> | <%= format_money(benefit_cap) %>
+
+ Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
+
+ ##How this is worked out
+
+ The benefits you get are added together. The total amount of benefits over your benefit cap is subtracted from your Housing Benefit:
+
+ Total amount of benefits affected by the Greater London cap: <%= format_money(total_benefits_amount) %>
+
+ Your Housing Benefit is reduced by the amount you are over your benefit cap of <%= format_money(benefit_cap) %>:
+
+ Total benefits affected: <%= format_money(total_benefits_amount) %>
+
+ Minus Greater London benefit cap: <%= format_money(benefit_cap) %>
+
+ Total over Greater London cap: <%= format_money(total_over_cap) %>
+
+ Housing benefit: <%= format_money(housing_benefit_amount) %>
+
+ Minus total over Greater London cap: <%= format_money(total_over_cap) %>
+
+ New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
+
+ <% if new_housing_benefit_amount < 0.5 %>
+ Your Housing Benefit won’t be reduced to less than 50p. You need to be getting some Housing Benefit to be eligible for other services.
+ <% end %>
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.govspeak.erb
deleted file mode 100644
index a26fe1be895..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re affected by the Greater London benefit cap.
-
-<% end %>
-
-<% render_content_for :body do %>
-
- Your weekly benefits | Greater London benefit cap
- -|-
- <%= format_money(total_benefits_amount) %> | <%= format_money(benefit_cap) %>
-
- Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
-
- ##How this is worked out
-
- The benefits you get are added together. The total amount of benefits over your benefit cap is subtracted from your Housing Benefit:
-
- Total amount of benefits affected by the Greater London cap: <%= format_money(total_benefits_amount) %>
-
- Your Housing Benefit is reduced by the amount you are over your benefit cap of <%= format_money(benefit_cap) %>:
-
- Total benefits affected: <%= format_money(total_benefits_amount) %>
-
- Minus Greater London benefit cap: <%= format_money(benefit_cap) %>
-
- Total over Greater London cap: <%= format_money(total_over_cap) %>
-
- Housing benefit: <%= format_money(housing_benefit_amount) %>
-
- Minus total over Greater London cap: <%= format_money(total_over_cap) %>
-
- New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
-
- <% if new_housing_benefit_amount < 0.5 %>
- Your Housing Benefit won’t be reduced to less than 50p. You need to be getting some Housing Benefit to be eligible for other services.
- <% end %>
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..545cf1d1af4
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.erb
@@ -0,0 +1,41 @@
+<% text_for :title do %>
+ Based on your answers, you’re affected by the outside London benefit cap.
+
+<% end %>
+
+<% govspeak_for :body do %>
+
+ Your weekly benefits | Outside London benefit cap
+ -|-
+ <%= format_money(total_benefits_amount) %> | <%= format_money(benefit_cap) %>
+
+ Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
+
+ ##How this is worked out
+
+ The benefits you get are added together. The total amount of benefits over the outside London benefit cap is subtracted from your Housing Benefit:
+
+ Total amount of benefits affected by the outside London cap: <%= format_money(total_benefits_amount) %>
+
+ Your Housing Benefit is reduced by the amount you are over the outside London benefit cap of <%= format_money(benefit_cap) %>:
+
+ Total benefits affected: <%= format_money(total_benefits_amount) %>
+
+ Minus outside London benefit cap: <%= format_money(benefit_cap) %>
+
+ Total over outside London cap: <%= format_money(total_over_cap) %>
+
+ Housing benefit: <%= format_money(housing_benefit_amount) %>
+
+ Minus total over outside London cap: <%= format_money(total_over_cap) %>
+
+ New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
+
+ <% if new_housing_benefit_amount < 0.5 %>
+ Your Housing Benefit won’t be reduced to less than 50p. You need to be getting some Housing Benefit to be eligible for other services.
+ <% end %>
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.govspeak.erb
deleted file mode 100644
index 7861034c1ae..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re affected by the outside London benefit cap.
-
-<% end %>
-
-<% render_content_for :body do %>
-
- Your weekly benefits | Outside London benefit cap
- -|-
- <%= format_money(total_benefits_amount) %> | <%= format_money(benefit_cap) %>
-
- Your Housing Benefit will be: <%= format_money(new_housing_benefit) %>.
-
- ##How this is worked out
-
- The benefits you get are added together. The total amount of benefits over the outside London benefit cap is subtracted from your Housing Benefit:
-
- Total amount of benefits affected by the outside London cap: <%= format_money(total_benefits_amount) %>
-
- Your Housing Benefit is reduced by the amount you are over the outside London benefit cap of <%= format_money(benefit_cap) %>:
-
- Total benefits affected: <%= format_money(total_benefits_amount) %>
-
- Minus outside London benefit cap: <%= format_money(benefit_cap) %>
-
- Total over outside London cap: <%= format_money(total_over_cap) %>
-
- Housing benefit: <%= format_money(housing_benefit_amount) %>
-
- Minus total over outside London cap: <%= format_money(total_over_cap) %>
-
- New Housing Benefit amount: <%= format_money(new_housing_benefit) %>
-
- <% if new_housing_benefit_amount < 0.5 %>
- Your Housing Benefit won’t be reduced to less than 50p. You need to be getting some Housing Benefit to be eligible for other services.
- <% end %>
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..22d9f0efb5f
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.erb
@@ -0,0 +1,18 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ These benefits are exempt from the new benefit cap:
+
+- Working Tax Credit
+ <% exempt_benefits_descriptions.each do |exempt_benefit| %>
+ - <%= exempt_benefit %>
+ <% end %>
+
+ You may be affected by the cap if your circumstances change.
+
+ Contact the Department for Work and Pensions if you need further help:
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.govspeak.erb
deleted file mode 100644
index 89fbf15b1e5..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- These benefits are exempt from the new benefit cap:
-
-- Working Tax Credit
- <% exempt_benefits_descriptions.each do |exempt_benefit| %>
- - <%= exempt_benefit %>
- <% end %>
-
- You may be affected by the cap if your circumstances change.
-
- Contact the Department for Work and Pensions if you need further help:
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..cd5408abb95
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.erb
@@ -0,0 +1,18 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ These benefits are exempt from the benefit cap:
+
+- Working Tax Credit
+ <% exempt_benefits_descriptions.each do |exempt_benefit| %>
+ - <%= exempt_benefit %>
+ <% end %>
+
+ You may be affected by the cap if your circumstances change.
+
+ Contact the Department for Work and Pensions if you need further help:
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.govspeak.erb
deleted file mode 100644
index 15c2d1d7947..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- These benefits are exempt from the benefit cap:
-
-- Working Tax Credit
- <% exempt_benefits_descriptions.each do |exempt_benefit| %>
- - <%= exempt_benefit %>
- <% end %>
-
- You may be affected by the cap if your circumstances change.
-
- Contact the Department for Work and Pensions if you need further help:
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..783ff7122f4
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.erb
@@ -0,0 +1,17 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ ##How this is worked out
+
+ The total amount of your benefits are added together:
+
+ Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
+
+ As this amount is lower than your benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.govspeak.erb
deleted file mode 100644
index c962a3a88e8..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- ##How this is worked out
-
- The total amount of your benefits are added together:
-
- Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
-
- As this amount is lower than your benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..5dd2e601072
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the Greater London benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ This is because the total amount of benefits you get are the same as or lower than this benefit cap.
+
+ ##How this is worked out
+
+ The total amount of your benefits are added together:
+
+ Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
+
+ As this amount is lower than your benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.govspeak.erb
deleted file mode 100644
index d25028fda77..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the Greater London benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- This is because the total amount of benefits you get are the same as or lower than this benefit cap.
-
- ##How this is worked out
-
- The total amount of your benefits are added together:
-
- Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
-
- As this amount is lower than your benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..d2caaf69f7b
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the outside London benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ This is because the total amount of benefits you get are the same as or lower than this benefit cap.
+
+ ##How this is worked out
+
+ The total amount of your benefits are added together:
+
+ Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
+
+ As this amount is lower than the outside London benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
+
+ This is an estimate only. Contact the Department for Work and Pensions if you need further help.
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.govspeak.erb
deleted file mode 100644
index e8fbfa2aa18..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the outside London benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- This is because the total amount of benefits you get are the same as or lower than this benefit cap.
-
- ##How this is worked out
-
- The total amount of your benefits are added together:
-
- Total amount of benefits affected by cap: <%= format_money(total_benefits_amount) %>
-
- As this amount is lower than the outside London benefit cap of <%= format_money(benefit_cap) %>, your benefits won’t change.
-
- This is an estimate only. Contact the Department for Work and Pensions if you need further help.
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..2fee4f40846
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ You might be affected by this cap if you start claiming Housing Benefit.
+
+ Contact the Department for Work and Pensions if you need further help:
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.govspeak.erb
deleted file mode 100644
index 8a0637fe91d..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- You might be affected by this cap if you start claiming Housing Benefit.
-
- Contact the Department for Work and Pensions if you need further help:
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..2fee4f40846
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Based on your answers, you’re not affected by the benefit cap.
+<% end %>
+
+<% govspeak_for :body do %>
+ You might be affected by this cap if you start claiming Housing Benefit.
+
+ Contact the Department for Work and Pensions if you need further help:
+
+ <%= render partial: 'dwp_contact_details' %>
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.govspeak.erb
deleted file mode 100644
index 8a0637fe91d..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not affected by the benefit cap.
-<% end %>
-
-<% render_content_for :body do %>
- You might be affected by this cap if you start claiming Housing Benefit.
-
- Contact the Department for Work and Pensions if you need further help:
-
- <%= render partial: 'dwp_contact_details.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..62146d9ca0f
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.erb
@@ -0,0 +1,3 @@
+<% 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/_hints.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.govspeak.erb
deleted file mode 100644
index 305fa2b2450..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..357c0d0fec2
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Bereavement Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.govspeak.erb
deleted file mode 100644
index 62fdf523019..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Bereavement Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..15544b15c2f
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Carer's Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.govspeak.erb
deleted file mode 100644
index 3c11b6e65ab..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Carer's Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..67e95e281d4
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Child Benefit?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.govspeak.erb
deleted file mode 100644
index 0d457585c80..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Child Benefit?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..e3608a12019
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Child Tax Credit?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.govspeak.erb
deleted file mode 100644
index 3baf7cf6659..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Child Tax Credit?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..a018cee9cc7
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Enter your postcode
+
+<% end %>
+
+<% text_for :hint do %>
+ eg SW1A 2AA
+<% end %>
+
+<% text_for :error_postcode_invalid do %>
+ This isn't a valid postcode
+<% end %>
+<% text_for :error_postcode_incomplete do %>
+ Please enter a full postcode
+<% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.govspeak.erb
deleted file mode 100644
index 89ca5729613..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Enter your postcode
-
-<% end %>
-
-<% render_content_for :hint do %>
- eg SW1A 2AA
-<% end %>
-
-<% render_content_for :error_postcode_invalid do %>
- This isn't a valid postcode
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..e343db2050e
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Employment and Support Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.govspeak.erb
deleted file mode 100644
index 73c28eaaada..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Employment and Support Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..6f4e8550e5d
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Guardian's Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.govspeak.erb
deleted file mode 100644
index 19a76f4efe0..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Guardian's Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..ffabaa260dd
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Housing Benefit?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.govspeak.erb
deleted file mode 100644
index becc6238d52..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Housing Benefit?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..f079f7b7d0e
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Incapacity Benefit?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.govspeak.erb
deleted file mode 100644
index 1b8d5f7e503..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Incapacity Benefit?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..03677711c9f
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Income Support?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.govspeak.erb
deleted file mode 100644
index 8e9bb6fa23e..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Income Support?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..3d59c1d7c21
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Jobseeker’s Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.govspeak.erb
deleted file mode 100644
index e623980ad50..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Jobseeker’s Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..acbe707311b
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Maternity Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.govspeak.erb
deleted file mode 100644
index a87c836494b..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Maternity Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..8cd030f08b7
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you receive Housing Benefit?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.govspeak.erb
deleted file mode 100644
index 72971943832..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you receive Housing Benefit?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..77642a5f253
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Do you or someone in your household get any of the following benefits?
+<% end %>
+
+<% text_for :hint do %>
+ If you do not receive any of these click 'Next step'.
+<% end %>
+
+<% options(exempt_benefits) %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.govspeak.erb
deleted file mode 100644
index 2e9e1fd77b8..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Do you or someone in your household get any of the following benefits?
-<% end %>
-
-<% render_content_for :hint do %>
- If you do not receive any of these click 'Next step'.
-<% end %>
-
-<% options(exempt_benefits) %>
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
new file mode 100644
index 00000000000..a97fd202438
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Do you or someone in your household get any of the following benefits?
+<% end %>
+
+<% options(benefit_options) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.govspeak.erb
deleted file mode 100644
index dec13a9e607..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..e1184e3f583
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Severe Disability Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.govspeak.erb
deleted file mode 100644
index 9f02ceeef0a..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Severe Disability Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..9fd101c68c7
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ Are you:
+<% end %>
+
+<% options(weekly_benefit_cap_descriptions) %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.govspeak.erb
deleted file mode 100644
index 79126e58f21..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- Are you:
-<% end %>
-
-<% options(weekly_benefit_cap_descriptions) %>
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
new file mode 100644
index 00000000000..022e250c31f
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Widow's Pension?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.govspeak.erb
deleted file mode 100644
index adcc953c408..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Widow's Pension?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..5f02936a177
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Widowed Mother's Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.govspeak.erb
deleted file mode 100644
index b0cb22b8cbd..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Widowed Mother's Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..094fa9b3df9
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Widowed Parent's Allowance?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.govspeak.erb
deleted file mode 100644
index e5be3a7c4bd..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Widowed Parent's Allowance?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..13529574eb4
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How much do you or someone in your household get for Widow's Pension (age related)?
+<% end %>
+
+<%= render partial: 'hints' %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.govspeak.erb
deleted file mode 100644
index 1674b522545..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How much do you or someone in your household get for Widow's Pension (age related)?
-<% end %>
-
-<%= render partial: 'hints.govspeak.erb' %>
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
new file mode 100644
index 00000000000..cb246f67a56
--- /dev/null
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do you qualify for Working Tax Credit?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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/benefit-cap-calculator/questions/working_tax_credit.govspeak.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.govspeak.erb
deleted file mode 100644
index a2b861ba81b..00000000000
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do you qualify for Working Tax Credit?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..6fa9e547d0f
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ Find coronavirus financial support for your business
+<% end %>
+
+<% 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
+ business is open or closed.
+<% end %>
+
+<% govspeak_for :body 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
+ business is open or closed.
+
+ Use this business support finder to see what support is available for you
+ and your business.
+<% end %>
+
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.govspeak.erb
deleted file mode 100644
index 029d2d22ec3..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- Find coronavirus financial support for your business
-<% end %>
-
-<% render_content_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
- business is open or closed.
-<% end %>
-
-<% render_content_for :body 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
- business is open or closed.
-
- Use this business support finder to see what support is available for you
- and your business.
-<% end %>
-
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
new file mode 100644
index 00000000000..e14fa2de63b
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb
@@ -0,0 +1,298 @@
+<% text_for :title do %>
+ Support you may be entitled to
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if calculator.show?(:job_retention_scheme) %>
+ $CTA
+ ### Coronavirus Job Retention Scheme
+
+ If you are an employer with a PAYE scheme, you should be able to access support to continue paying part of your employees' salary instead of laying them off.
+
+ This applies to employees who have been asked to stop working because of coronavirus, but are being kept on the payroll. They are known as ‘furloughed workers’. HMRC will pay 80% of their wages, up to £2,500 per month.
+
+ You must have agreed with your employee to put them on furlough by 10 June 2020. You must claim wages for your furloughed employee by 31 July 2020.
+
+ [Check if you are eligible for the Coronavirus Job Retention Scheme](/guidance/claim-for-wage-costs-through-the-coronavirus-job-retention-scheme)
+ $CTA
+ <% end %>
+
+ $CTA
+ ### Deferring VAT
+
+ If you’re a UK VAT registered business and have a VAT payment due between 20 March 2020 and 30 June 2020, you have the option to defer payment until 31 March 2021.
+
+ [Check if you are eligible to defer your VAT payment](/guidance/deferral-of-vat-payments-due-to-coronavirus-covid-19)
+ $CTA
+
+ <% if calculator.show?(:self_assessment_payments) %>
+ $CTA
+ ### Deferring Self Assessment payments on account
+
+ If you are due to pay a Self Assessment payment on account by 31 July 2020, you can defer payment up until January 2021. You will not be charged any interest or penalties during the deferral period.
+
+ You do not need to be self-employed to be eligible for the deferment.
+
+ The deferment is optional. If you are still able to pay your second payment on 31 July, you should do so.
+
+ This is an automatic offer. You do not need to apply for the deferral, or tell HMRC. If you normally pay by Direct Debit you should contact your bank to cancel your Direct Debit as soon as you can. You do not need to contact HMRC before doing this.
+
+ [Check if you are eligible to defer your Self Assessment payment on account](/guidance/defer-your-self-assessment-payment-on-account-due-to-coronavirus-covid-19)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:statutory_sick_rebate) %>
+ $CTA
+ ### Statutory Sick Pay rebate
+
+ Employers can reclaim Statutory Sick Pay (SSP) paid for sickness absence due to COVID‑19. This scheme will cover up to 2 weeks of SSP for every eligible employee.
+
+ Employers must maintain records of staff absences and payments for SSP. Employees will not have to provide a GP fit note.
+
+ You are eligible if your business meets both of the following requirements. Your business is:
+
+ - UK based
+ - small or medium-sized and employs fewer than 250 employees as of 28 February 2020
+
+ [Claim back Statutory Sick Pay paid to employees due to coronavirus (COVID‑19)](/guidance/claim-back-statutory-sick-pay-paid-to-employees-due-to-coronavirus-covid-19)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:self_employed_income_scheme) %>
+ $CTA
+ ### Self-Employment Income Support Scheme
+
+ If you are self-employed (either as an individual or in a partnership), you can claim a taxable grant worth 80% of your trading profits up to a maximum of £2,500 per month, for 3 months. This may be extended.
+
+ You may be eligible for this scheme if:
+
+ - you've lost profits due to coronavirus
+ - you've submitted your Self Assessment tax return for 2018 to 2019 tax year
+ - you traded in 2019 to 2020 tax year
+ - you are trading when you apply, or would be except for coronavirus
+ - you intend to continue trading in 2020 to 2021 tax year
+ - your trading profits have been no more than £50,000 for either 2018 to 2019 tax year, or as an average of last 3 financial years
+ - your trading profits have been more than half of your total income for either 2018 to 2019 tax year, or as an average of last 3 financial years
+
+ ^Trading profits do not include dividends paid from your own company to yourself.^
+
+ If you are not eligible for Self-Employed Income Support Scheme, you may be eligible for [Universal Credit](/universal-credit) or [Employment and Support Allowance](/employment-support-allowance/eligibility).
+
+ [Claim a grant through the Self-Employment Income Support Scheme](/guidance/claim-a-grant-through-the-coronavirus-covid-19-self-employment-income-support-scheme)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:retail_hospitality_leisure_business_rates) %>
+ $CTA
+ ### Business rates holiday for retail, hospitality and leisure
+
+ Businesses in the retail, hospitality and leisure sectors in England will not have to pay business rates for the 2020 to 2021 tax year.
+
+ You do not need to do anything. If you are eligible, your local council will apply the discount automatically.
+
+ You’re eligible if your property is a:
+
+ - shop
+ - restaurant, café, bar or pub
+ - cinema or live music venue
+ - assembly or leisure property - for example, a sports club, a gym or a spa
+ - hospitality property - for example, a hotel, a guest house or self-catering accommodation
+
+ [Check if your retail, hospitality or leisure business is eligible for business rates relief due to coronavirus (COVID‑19)](/guidance/check-if-your-retail-hospitality-or-leisure-business-is-eligible-for-business-rates-relief-due-to-coronavirus-covid-19)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:retail_hospitality_leisure_grant_funding) %>
+ $CTA
+ ### Retail, Hospitality and Leisure Grant Fund
+
+ You may be eligible for a grant of up to £25,000 per property.
+
+ If your business has a property with a rateable value of £15,000 or under, you may be eligible for a grant of £10,000.
+
+ If your business has a property that has a rateable value of over £15,000 but less than £51,000, you may be eligible for a grant of £25,000.
+
+ You are eligible if your business:
+
+ - is based in England
+ - is in the retail, hospitality or leisure sector
+ - has a property that is wholly or mainly used as hospitality, retail, or leisure venue
+
+ Contact your local council if you think you are eligible for a grant but have not yet received it.
+
+ [Coronavirus guidance on business support grant funding](/government/publications/coronavirus-covid-19-business-support-grant-funding-guidance-for-businesses)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:nursery_support) %>
+ $CTA
+ ### Support for nursery businesses that pay business rates
+
+ Nurseries in England do not have to pay business rates for the 2020 to 2021 tax year. Your council will do this automatically.
+
+ You’re eligible if your business is on Ofsted’s Early Years Register and provides care and education for children up to 5 years old (early years foundation stage).
+
+ Local authority-run nurseries are not eligible.
+
+ [Check if your nursery is eligible for business rates relief due to coronavirus (COVID‑19)](/guidance/check-if-your-nursery-is-eligible-for-business-rates-relief-due-to-coronavirus-covid-19)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:small_business_grant_funding) %>
+ $CTA
+ ### Small Business Grant Funding
+
+ You may be eligible for a one-off grant of £10,000 if you are a small business that already pays little or no business rates because of:
+
+ - small business relief (SBBR)
+ - rural rate relief (RRR)
+ - tapered relief
+
+ You are eligible if:
+
+ - your business is based in England
+ - in receipt of small business rate relief or rural rate relief as of 11 March 2020
+ - you are a business that occupies a property
+
+ Contact your local council if you think you are eligible for a grant but have not yet received it.
+
+ [Coronavirus: business support grant funding guidance for businesses](/government/publications/coronavirus-covid-19-business-support-grant-funding-guidance-for-businesses)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:discretionary_grant) %>
+ $CTA
+ ### Discretionary Grant Fund
+
+ Small and micro businesses with fixed property costs that are not eligible for the Small Business Grant Fund or the Retail, Hospitality and Leisure Grant Fund may be eligible for the Discretionary Grant Scheme.
+
+ You can get a grant of £25,000, £10,000 or any amount under £10,000.
+
+ [Check if your business is eligible for the Discretionary Grant Fund](/guidance/apply-for-the-coronavirus-local-authority-discretionary-grants-fund)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:business_loan_scheme) %>
+ $CTA
+ ### Coronavirus Business Interruption Loan Scheme
+
+ If you are a small to medium-sized business (SME) you may be able to apply for a temporary loan, overdraft, invoice finance and asset finance of up to £5 million, for up to 6 years.
+
+ You may also be eligible for Business Interruption Payment to cover the first 12 months of interest payments and any lender fees. The government will give lenders 80% guarantee on each loan (subject to pre-lender cap on claims).
+
+ ^Self-employed people are also eligible for Coronavirus Business Interruption Loan Scheme.^
+
+ You may be eligible for this scheme if you meet all of the following criteria:
+
+ - your business is UK-based, with a turnover of no more than £45 million per year
+ - you have a borrowing proposal which would be considered viable by the lender, if not for the current pandemic
+ - you can self-certify that coronavirus (COVID‑19) has adversely impacted your business
+
+ [Apply for the Coronavirus Business Interruption Loan Scheme](/guidance/apply-for-the-coronavirus-business-interruption-loan-scheme)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:bounce_back_loan) %>
+ $CTA
+ ### Coronavirus Bounce Back Loan
+
+ If your small to medium-sized business (SME) is affected by coronavirus, you may be able to borrow between £2,000 and £50,000 through a Bounce Back Loan scheme.
+
+ The government will guarantee 100% of the loan and for the first 12 months you will not have to pay any fees or interest, or make repayments.
+
+ You may be eligible for this scheme if your business:
+
+ - has been negatively affected by coronavirus
+ - was not an ‘undertaking in difficulty’ on 31 December 2019
+
+ This includes self-employed people.
+
+ [Apply for a Coronavirus Bounce Back loan](/guidance/apply-for-a-coronavirus-bounce-back-loan)
+ $CTA
+ <% end %>
+
+ $CTA
+ ### Support for businesses paying tax: Time To Pay Service
+
+ If you cannot pay your tax bill on time because of coronavirus, you may be able to delay it without penalty using HMRC’s Time to Pay service.
+
+ You may be eligible if you are a UK business that:
+
+ - pays tax to the UK government
+ - has outstanding tax liabilities
+
+ [If you cannot pay your tax bill on time](/difficulties-paying-hmrc)
+ $CTA
+
+ <% if calculator.show?(:large_business_loan_scheme) %>
+ $CTA
+ ### Coronavirus Large Business Interruption Loan Scheme
+
+ The Coronavirus Large Business Interruption Loan Scheme (CLBILS) provides a government guarantee of 80% on each loan, to give banks further confidence in financing businesses impacted by coronavirus. It allows banks to make loans of up to £200 million.
+
+ You can apply for this loan if your business:
+
+ - is UK based
+ - has an annual turnover of at least £45 million
+ - meets the other British Business Bank eligibility requirements
+
+ The scheme is delivered through commercial lenders, supported by the Government-backed British Business Bank. Facilities backed by a guarantee under CLBILS are offered at commercial rates of interest.
+
+ [Apply for the Coronavirus Large Business Interruption Loan Scheme](/guidance/apply-for-the-coronavirus-large-business-interruption-loan-scheme)
+ $CTA
+ <% end %>
+
+ <% if calculator.show?(:future_fund) %>
+ $CTA
+ ### Future Fund
+
+ The Future Fund scheme will issue convertible loans between £125,000 to £5 million to innovative companies facing financing difficulties due to the coronavirus outbreak.
+
+ Your business is eligible if:
+
+ - it is UK-incorporated (if your business is part of a corporate group, only the parent company is eligible)
+ - it has raised at least £250,000 in equity investment from third-party investors in the last 5 years
+ - none of its shares are traded on a regulated market, multilateral trading facility or other listing venue
+ - it was incorporated on or before 31 December 2019
+ - half or more employees are UK-based or half or more revenues are from UK sales
+
+ [Find out how to apply](/guidance/future-fund)
+ $CTA
+ <% end %>
+
+ <% if calculator.business_based == "scotland" %>
+ $CTA
+ Find out [what support is available in Scotland](https://findbusinesssupport.gov.scot/coronavirus-advice).
+ You can be eligible for both Scottish and UK-wide schemes.
+ $CTA
+ <% end %>
+
+ <% if calculator.business_based == "wales" %>
+ $CTA
+ Find out [what support is available in Wales](https://businesswales.gov.wales/coronavirus-advice).
+ You can be eligible for both Welsh and UK-wide schemes.
+ $CTA
+ <% end %>
+
+ <% if calculator.business_based == "northern_ireland" %>
+ $CTA
+ Find out [what support is available in Northern Ireland](https://www.nibusinessinfo.co.uk/business-support/coronavirus).
+ You can be eligible for both Northern Ireland and UK-wide schemes.
+ $CTA
+ <% end %>
+
+ Please note that you may be eligible for more than one scheme, whether your business is open or closed.
+
+ For detailed information about different types of business support schemes, check the
+ [coronavirus business support page](/coronavirus/business-support).
+<% end %>
+
+<% html_for :body do %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.govspeak.erb
deleted file mode 100644
index a7dbc3323d0..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.govspeak.erb
+++ /dev/null
@@ -1,298 +0,0 @@
-<% render_content_for :title do %>
- Support you may be entitled to
-<% end %>
-
-<% render_content_for :body do %>
- <% if calculator.show?(:job_retention_scheme) %>
- $CTA
- ### Coronavirus Job Retention Scheme
-
- If you are an employer with a PAYE scheme, you should be able to access support to continue paying part of your employees' salary instead of laying them off.
-
- This applies to employees who have been asked to stop working because of coronavirus, but are being kept on the payroll. They are known as ‘furloughed workers’. HMRC will pay 80% of their wages, up to £2,500 per month.
-
- You must have agreed with your employee to put them on furlough by 10 June 2020. You must claim wages for your furloughed employee by 31 July 2020.
-
- [Check if you are eligible for the Coronavirus Job Retention Scheme](/guidance/claim-for-wage-costs-through-the-coronavirus-job-retention-scheme)
- $CTA
- <% end %>
-
- $CTA
- ### Deferring VAT
-
- If you’re a UK VAT registered business and have a VAT payment due between 20 March 2020 and 30 June 2020, you have the option to defer payment until 31 March 2021.
-
- [Check if you are eligible to defer your VAT payment](/guidance/deferral-of-vat-payments-due-to-coronavirus-covid-19)
- $CTA
-
- <% if calculator.show?(:self_assessment_payments) %>
- $CTA
- ### Deferring Self Assessment payments on account
-
- If you are due to pay a Self Assessment payment on account by 31 July 2020, you can defer payment up until January 2021. You will not be charged any interest or penalties during the deferral period.
-
- You do not need to be self-employed to be eligible for the deferment.
-
- The deferment is optional. If you are still able to pay your second payment on 31 July, you should do so.
-
- This is an automatic offer. You do not need to apply for the deferral, or tell HMRC. If you normally pay by Direct Debit you should contact your bank to cancel your Direct Debit as soon as you can. You do not need to contact HMRC before doing this.
-
- [Check if you are eligible to defer your Self Assessment payment on account](/guidance/defer-your-self-assessment-payment-on-account-due-to-coronavirus-covid-19)
- $CTA
- <% end %>
-
- <% if calculator.show?(:statutory_sick_rebate) %>
- $CTA
- ### Statutory Sick Pay rebate
-
- Employers can reclaim Statutory Sick Pay (SSP) paid for sickness absence due to COVID‑19. This scheme will cover up to 2 weeks of SSP for every eligible employee.
-
- Employers must maintain records of staff absences and payments for SSP. Employees will not have to provide a GP fit note.
-
- You are eligible if your business meets both of the following requirements. Your business is:
-
- - UK based
- - small or medium-sized and employs fewer than 250 employees as of 28 February 2020
-
- [Claim back Statutory Sick Pay paid to employees due to coronavirus (COVID‑19)](/guidance/claim-back-statutory-sick-pay-paid-to-employees-due-to-coronavirus-covid-19)
- $CTA
- <% end %>
-
- <% if calculator.show?(:self_employed_income_scheme) %>
- $CTA
- ### Self-Employment Income Support Scheme
-
- If you are self-employed (either as an individual or in a partnership), you can claim a taxable grant worth 80% of your trading profits up to a maximum of £2,500 per month, for 3 months. This may be extended.
-
- You may be eligible for this scheme if:
-
- - you've lost profits due to coronavirus
- - you've submitted your Self Assessment tax return for 2018 to 2019 tax year
- - you traded in 2019 to 2020 tax year
- - you are trading when you apply, or would be except for coronavirus
- - you intend to continue trading in 2020 to 2021 tax year
- - your trading profits have been no more than £50,000 for either 2018 to 2019 tax year, or as an average of last 3 financial years
- - your trading profits have been more than half of your total income for either 2018 to 2019 tax year, or as an average of last 3 financial years
-
- ^Trading profits do not include dividends paid from your own company to yourself.^
-
- If you are not eligible for Self-Employed Income Support Scheme, you may be eligible for [Universal Credit](/universal-credit) or [Employment and Support Allowance](/employment-support-allowance/eligibility).
-
- [Claim a grant through the Self-Employment Income Support Scheme](/guidance/claim-a-grant-through-the-coronavirus-covid-19-self-employment-income-support-scheme)
- $CTA
- <% end %>
-
- <% if calculator.show?(:retail_hospitality_leisure_business_rates) %>
- $CTA
- ### Business rates holiday for retail, hospitality and leisure
-
- Businesses in the retail, hospitality and leisure sectors in England will not have to pay business rates for the 2020 to 2021 tax year.
-
- You do not need to do anything. If you are eligible, your local council will apply the discount automatically.
-
- You’re eligible if your property is a:
-
- - shop
- - restaurant, café, bar or pub
- - cinema or live music venue
- - assembly or leisure property - for example, a sports club, a gym or a spa
- - hospitality property - for example, a hotel, a guest house or self-catering accommodation
-
- [Check if your retail, hospitality or leisure business is eligible for business rates relief due to coronavirus (COVID‑19)](/guidance/check-if-your-retail-hospitality-or-leisure-business-is-eligible-for-business-rates-relief-due-to-coronavirus-covid-19)
- $CTA
- <% end %>
-
- <% if calculator.show?(:retail_hospitality_leisure_grant_funding) %>
- $CTA
- ### Retail, Hospitality and Leisure Grant Fund
-
- You may be eligible for a grant of up to £25,000 per property.
-
- If your business has a property with a rateable value of £15,000 or under, you may be eligible for a grant of £10,000.
-
- If your business has a property that has a rateable value of over £15,000 but less than £51,000, you may be eligible for a grant of £25,000.
-
- You are eligible if your business:
-
- - is based in England
- - is in the retail, hospitality or leisure sector
- - has a property that is wholly or mainly used as hospitality, retail, or leisure venue
-
- Contact your local council if you think you are eligible for a grant but have not yet received it.
-
- [Coronavirus guidance on business support grant funding](/government/publications/coronavirus-covid-19-business-support-grant-funding-guidance-for-businesses)
- $CTA
- <% end %>
-
- <% if calculator.show?(:nursery_support) %>
- $CTA
- ### Support for nursery businesses that pay business rates
-
- Nurseries in England do not have to pay business rates for the 2020 to 2021 tax year. Your council will do this automatically.
-
- You’re eligible if your business is on Ofsted’s Early Years Register and provides care and education for children up to 5 years old (early years foundation stage).
-
- Local authority-run nurseries are not eligible.
-
- [Check if your nursery is eligible for business rates relief due to coronavirus (COVID‑19)](/guidance/check-if-your-nursery-is-eligible-for-business-rates-relief-due-to-coronavirus-covid-19)
- $CTA
- <% end %>
-
- <% if calculator.show?(:small_business_grant_funding) %>
- $CTA
- ### Small Business Grant Funding
-
- You may be eligible for a one-off grant of £10,000 if you are a small business that already pays little or no business rates because of:
-
- - small business relief (SBBR)
- - rural rate relief (RRR)
- - tapered relief
-
- You are eligible if:
-
- - your business is based in England
- - in receipt of small business rate relief or rural rate relief as of 11 March 2020
- - you are a business that occupies a property
-
- Contact your local council if you think you are eligible for a grant but have not yet received it.
-
- [Coronavirus: business support grant funding guidance for businesses](/government/publications/coronavirus-covid-19-business-support-grant-funding-guidance-for-businesses)
- $CTA
- <% end %>
-
- <% if calculator.show?(:discretionary_grant) %>
- $CTA
- ### Discretionary Grant Fund
-
- Small and micro businesses with fixed property costs that are not eligible for the Small Business Grant Fund or the Retail, Hospitality and Leisure Grant Fund may be eligible for the Discretionary Grant Scheme.
-
- You can get a grant of £25,000, £10,000 or any amount under £10,000.
-
- [Check if your business is eligible for the Discretionary Grant Fund](/guidance/apply-for-the-coronavirus-local-authority-discretionary-grants-fund)
- $CTA
- <% end %>
-
- <% if calculator.show?(:business_loan_scheme) %>
- $CTA
- ### Coronavirus Business Interruption Loan Scheme
-
- If you are a small to medium-sized business (SME) you may be able to apply for a temporary loan, overdraft, invoice finance and asset finance of up to £5 million, for up to 6 years.
-
- You may also be eligible for Business Interruption Payment to cover the first 12 months of interest payments and any lender fees. The government will give lenders 80% guarantee on each loan (subject to pre-lender cap on claims).
-
- ^Self-employed people are also eligible for Coronavirus Business Interruption Loan Scheme.^
-
- You may be eligible for this scheme if you meet all of the following criteria:
-
- - your business is UK-based, with a turnover of no more than £45 million per year
- - you have a borrowing proposal which would be considered viable by the lender, if not for the current pandemic
- - you can self-certify that coronavirus (COVID‑19) has adversely impacted your business
-
- [Apply for the Coronavirus Business Interruption Loan Scheme](/guidance/apply-for-the-coronavirus-business-interruption-loan-scheme)
- $CTA
- <% end %>
-
- <% if calculator.show?(:bounce_back_loan) %>
- $CTA
- ### Coronavirus Bounce Back Loan
-
- If your small to medium-sized business (SME) is affected by coronavirus, you may be able to borrow between £2,000 and £50,000 through a Bounce Back Loan scheme.
-
- The government will guarantee 100% of the loan and for the first 12 months you will not have to pay any fees or interest, or make repayments.
-
- You may be eligible for this scheme if your business:
-
- - has been negatively affected by coronavirus
- - was not an ‘undertaking in difficulty’ on 31 December 2019
-
- This includes self-employed people.
-
- [Apply for a Coronavirus Bounce Back loan](/guidance/apply-for-a-coronavirus-bounce-back-loan)
- $CTA
- <% end %>
-
- $CTA
- ### Support for businesses paying tax: Time To Pay Service
-
- If you cannot pay your tax bill on time because of coronavirus, you may be able to delay it without penalty using HMRC’s Time to Pay service.
-
- You may be eligible if you are a UK business that:
-
- - pays tax to the UK government
- - has outstanding tax liabilities
-
- [If you cannot pay your tax bill on time](/difficulties-paying-hmrc)
- $CTA
-
- <% if calculator.show?(:large_business_loan_scheme) %>
- $CTA
- ### Coronavirus Large Business Interruption Loan Scheme
-
- The Coronavirus Large Business Interruption Loan Scheme (CLBILS) provides a government guarantee of 80% on each loan, to give banks further confidence in financing businesses impacted by coronavirus. It allows banks to make loans of up to £200 million.
-
- You can apply for this loan if your business:
-
- - is UK based
- - has an annual turnover of at least £45 million
- - meets the other British Business Bank eligibility requirements
-
- The scheme is delivered through commercial lenders, supported by the Government-backed British Business Bank. Facilities backed by a guarantee under CLBILS are offered at commercial rates of interest.
-
- [Apply for the Coronavirus Large Business Interruption Loan Scheme](/guidance/apply-for-the-coronavirus-large-business-interruption-loan-scheme)
- $CTA
- <% end %>
-
- <% if calculator.show?(:future_fund) %>
- $CTA
- ### Future Fund
-
- The Future Fund scheme will issue convertible loans between £125,000 to £5 million to innovative companies facing financing difficulties due to the coronavirus outbreak.
-
- Your business is eligible if:
-
- - it is UK-incorporated (if your business is part of a corporate group, only the parent company is eligible)
- - it has raised at least £250,000 in equity investment from third-party investors in the last 5 years
- - none of its shares are traded on a regulated market, multilateral trading facility or other listing venue
- - it was incorporated on or before 31 December 2019
- - half or more employees are UK-based or half or more revenues are from UK sales
-
- [Find out how to apply](/guidance/future-fund)
- $CTA
- <% end %>
-
- <% if calculator.business_based == "scotland" %>
- $CTA
- Find out [what support is available in Scotland](https://findbusinesssupport.gov.scot/coronavirus-advice).
- You can be eligible for both Scottish and UK-wide schemes.
- $CTA
- <% end %>
-
- <% if calculator.business_based == "wales" %>
- $CTA
- Find out [what support is available in Wales](https://businesswales.gov.wales/coronavirus-advice).
- You can be eligible for both Welsh and UK-wide schemes.
- $CTA
- <% end %>
-
- <% if calculator.business_based == "northern_ireland" %>
- $CTA
- Find out [what support is available in Northern Ireland](https://www.nibusinessinfo.co.uk/business-support/coronavirus).
- You can be eligible for both Northern Ireland and UK-wide schemes.
- $CTA
- <% end %>
-
- Please note that you may be eligible for more than one scheme, whether your business is open or closed.
-
- For detailed information about different types of business support schemes, check the
- [coronavirus business support page](/coronavirus/business-support).
-<% end %>
-
-<% render_content_for :body, format: :html do %>
-
-<% 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
new file mode 100644
index 00000000000..b2fb2c780f4
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What is your annual turnover?
+<% end %>
+
+<% options(
+ "500m_and_over": "£500 million and over",
+ "45m_to_500m": "£45 million to £500 million",
+ "85k_to_45m": "£85,000 to £45 million",
+ "under_85k": "Under £85,000",
+ "pre_revenue": "My business is a start-up and is pre-revenue",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.govspeak.erb
deleted file mode 100644
index 13be37287e4..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What is your annual turnover?
-<% end %>
-
-<% options(
- "500m_and_over": "£500 million and over",
- "45m_to_500m": "£45 million to £500 million",
- "85k_to_45m": "£85,000 to £45 million",
- "under_85k": "Under £85,000",
- "pre_revenue": "My business is a start-up and is pre-revenue",
-) %>
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
new file mode 100644
index 00000000000..5df8fdb4dc2
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Where is your business based?
+<% end %>
+
+<% options(
+ "england": "England",
+ "scotland": "Scotland",
+ "wales": "Wales",
+ "northern_ireland": "Northern Ireland"
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.govspeak.erb
deleted file mode 100644
index 7bcc60ec6e4..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Where is your business based?
-<% end %>
-
-<% options(
- "england": "England",
- "scotland": "Scotland",
- "wales": "Wales",
- "northern_ireland": "Northern Ireland"
-) %>
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
new file mode 100644
index 00000000000..08f58aaa69a
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How many employees does your business have?
+<% end %>
+
+<% options(
+ "0_to_249": "0 to 249 employees",
+ "over_249": "Over 249 employees",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.govspeak.erb
deleted file mode 100644
index 5cc2dbc37e0..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How many employees does your business have?
-<% end %>
-
-<% options(
- "0_to_249": "0 to 249 employees",
- "over_249": "Over 249 employees",
-) %>
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
new file mode 100644
index 00000000000..86eb44fa3af
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What is the rateable value of your business' non-domestic property?
+<% end %>
+
+<% text_for :hint do %>
+ The rateable value of your property is used by your local council to calculate your business rates bill.
+<% end %>
+
+<% options(
+ "51k_and_over": "£51,000 and over",
+ "under_51k": "Under £51,000",
+ "none": "My business does not have any non-domestic property",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.govspeak.erb
deleted file mode 100644
index 26f6dc21cce..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What is the rateable value of your business' non-domestic property?
-<% end %>
-
-<% render_content_for :hint do %>
- The rateable value of your property is used by your local council to calculate your business rates bill.
-<% end %>
-
-<% options(
- "51k_and_over": "£51,000 and over",
- "under_51k": "Under £51,000",
- "none": "My business does not have any non-domestic property",
-) %>
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
new file mode 100644
index 00000000000..da97af1e84d
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you an employer with a PAYE scheme?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.govspeak.erb
deleted file mode 100644
index f8e53179173..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you an employer with a PAYE scheme?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..ffa6adbc018
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Is your business in receipt of small business rate relief or rural rate
+ relief as of 11 March 2020?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.govspeak.erb
deleted file mode 100644
index 8e09871b185..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Is your business in receipt of small business rate relief or rural rate
- relief as of 11 March 2020?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..8ce098c11ee
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your business in any of the following sectors:
+<% end %>
+
+<% options(
+ "retail_hospitality_or_leisure": "Retail, Hospitality or Leisure",
+ "nurseries": "Nurseries",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.govspeak.erb
deleted file mode 100644
index 6631d4c21d3..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your business in any of the following sectors:
-<% end %>
-
-<% options(
- "retail_hospitality_or_leisure": "Retail, Hospitality or Leisure",
- "nurseries": "Nurseries",
-) %>
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
new file mode 100644
index 00000000000..58e378f60bb
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you due to pay a Self Assessment payment on account by 31 July 2020?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.govspeak.erb
deleted file mode 100644
index d494a11bb27..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you due to pay a Self Assessment payment on account by 31 July 2020?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..563e417876e
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Are you self-employed?
+<% end %>
+
+<% text_for :hint do %>
+ For this question, limited company directors are not considered self-employed.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.govspeak.erb
deleted file mode 100644
index 20f0652bad1..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Are you self-employed?
-<% end %>
-
-<% render_content_for :hint do %>
- For this question, limited company directors are not considered self-employed.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..a585b2370dd
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ What size was your business as of 28 February?
+<% end %>
+
+<% options(
+ "sme": "Small or medium enterprise (SME): 0 to 249 employees",
+ "large": "Large enterprises: over 249 employees",
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.govspeak.erb
deleted file mode 100644
index e9e5f79c126..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- What size was your business as of 28 February?
-<% end %>
-
-<% options(
- "sme": "Small or medium enterprise (SME): 0 to 249 employees",
- "large": "Large enterprises: over 249 employees",
-) %>
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
new file mode 100644
index 00000000000..5df8fdb4dc2
--- /dev/null
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Where is your business based?
+<% end %>
+
+<% options(
+ "england": "England",
+ "scotland": "Scotland",
+ "wales": "Wales",
+ "northern_ireland": "Northern Ireland"
+) %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.govspeak.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.govspeak.erb
deleted file mode 100644
index 7bcc60ec6e4..00000000000
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Where is your business based?
-<% end %>
-
-<% options(
- "england": "England",
- "scotland": "Scotland",
- "wales": "Wales",
- "northern_ireland": "Northern Ireland"
-) %>
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
new file mode 100644
index 00000000000..5c4cd631e59
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Calculate your agricultural worker holiday entitlement
+<% end %>
+
+<% text_for :meta_description do %>
+ Work out how much statutory holiday leave you’re entitled to as an agricultural worker
+<% end %>
+
+<% govspeak_for :body do %>
+ Work out how much statutory holiday leave you're entitled to as an agricultural worker.
+
+ Agricultural holiday entitlement is different in [Scotland](http://www.scotland.gov.uk/Publications/2012/10/7886/5){:rel="external"}
+ and [Northern Ireland.](http://www.dardni.gov.uk/index/fisheries-farming-and-food/enforcement-awb/awb-current-terms-and-conditions-of-employment-wages-etc.htm){:rel="external"}
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.govspeak.erb
deleted file mode 100644
index 0d7bfe0e48b..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Calculate your agricultural worker holiday entitlement
-<% end %>
-
-<% render_content_for :meta_description do %>
- Work out how much statutory holiday leave you’re entitled to as an agricultural worker
-<% end %>
-
-<% render_content_for :body do %>
- Work out how much statutory holiday leave you're entitled to as an agricultural worker.
-
- Agricultural holiday entitlement is different in [Scotland](http://www.scotland.gov.uk/Publications/2012/10/7886/5){:rel="external"}
- and [Northern Ireland.](http://www.dardni.gov.uk/index/fisheries-farming-and-food/enforcement-awb/awb-current-terms-and-conditions-of-employment-wages-etc.htm){:rel="external"}
-<% 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
new file mode 100644
index 00000000000..1778b4bf9b8
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.erb
@@ -0,0 +1,3 @@
+<% 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.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.govspeak.erb
deleted file mode 100644
index e554f033bc8..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..51ccb091d8e
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.erb
@@ -0,0 +1,3 @@
+<% 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/outcomes/done_with_number_formatting.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.govspeak.erb
deleted file mode 100644
index b0ce8c13bdd..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..7ef3d260c1c
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ How many days do you work per week?
+<% end %>
+
+<% options(
+ "7-days": "7 days per week",
+ "6-days": "6 days per week",
+ "5-days": "5 days per week",
+ "4-days": "4 days per week",
+ "3-days": "3 days per week",
+ "2-days": "2 days per week",
+ "1-day": "1 day per week"
+) %>
+
+<% govspeak_for :body do %>
+ Include guaranteed overtime hours if:
+
+ - you have to work them as part of your contract
+ - you're paid for the time even if there’s no work for you to do
+
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
deleted file mode 100644
index b12e1109f9e..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- How many days do you work per week?
-<% end %>
-
-<% options(
- "7-days": "7 days per week",
- "6-days": "6 days per week",
- "5-days": "5 days per week",
- "4-days": "4 days per week",
- "3-days": "3 days per week",
- "2-days": "2 days per week",
- "1-day": "1 day per week"
-) %>
-
-<% render_content_for :body do %>
- Include guaranteed overtime hours if:
-
- - you have to work them as part of your contract
- - you're paid for the time even if there’s no work for you to do
-
-<% 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
new file mode 100644
index 00000000000..578553d06d2
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% 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 %>
+
+<% 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_total_days.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.govspeak.erb
deleted file mode 100644
index bfd7d607b80..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..7407e86b5e4
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many weeks have you worked continuously for your current employer?
+<% end %>
+
+<% text_for :label do %>
+ Weeks worked at current employer
+<% end %>
+
+<% 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/how_many_weeks_at_current_employer.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.govspeak.erb
deleted file mode 100644
index 20e2c868fcd..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many weeks have you worked continuously for your current employer?
-<% end %>
-
-<% render_content_for :label do %>
- Weeks worked at current employer
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..1fe63a3a854
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What date will your holiday start?
+<% end %>
+
+<% 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/what_date_does_holiday_start.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.govspeak.erb
deleted file mode 100644
index 6c8d411901a..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What date will your holiday start?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..cd34afbfa0d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you work the same number of days each week?
+<% end %>
+
+<% options(
+ "same-number-of-days": "Yes",
+ "different-number-of-days": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.govspeak.erb
deleted file mode 100644
index b6662a71655..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you work the same number of days each week?
-<% end %>
-
-<% options(
- "same-number-of-days": "Yes",
- "different-number-of-days": "No"
-) %>
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
new file mode 100644
index 00000000000..509963ba2b2
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Have you worked for the same employer for a full year?
+<% end %>
+
+<% options(
+ "same-employer": "Yes",
+ "multiple-employers": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.govspeak.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.govspeak.erb
deleted file mode 100644
index 8d376dc7e57..00000000000
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Have you worked for the same employer for a full year?
-<% end %>
-
-<% options(
- "same-employer": "Yes",
- "multiple-employers": "No"
-) %>
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
new file mode 100644
index 00000000000..08474988243
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Calculate your employee's statutory redundancy pay
+<% end %>
+
+<% text_for :meta_description do %>
+ Employer calculator - calculate your employee's statutory redundancy payment
+<% end %>
+
+<% govspeak_for :body do %>
+ Calculate an employee’s statutory redundancy pay.
+
+ Redundancy payments are based on age, weekly pay and number of years in the job.
+
+ Employees only qualify if they’ve worked at least 2 full years for you.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.govspeak.erb
deleted file mode 100644
index b8fdb9c75a3..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Calculate your employee's statutory redundancy pay
-<% end %>
-
-<% render_content_for :meta_description do %>
- Employer calculator - calculate your employee's statutory redundancy payment
-<% end %>
-
-<% render_content_for :body do %>
- Calculate an employee’s statutory redundancy pay.
-
- Redundancy payments are based on age, weekly pay and number of years in the job.
-
- Employees only qualify if they’ve worked at least 2 full years for you.
-<% 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
new file mode 100644
index 00000000000..bc1cc1b033e
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.erb
@@ -0,0 +1,26 @@
+<% text_for :title do %>
+ Statutory redundancy payment: <%= format_money(statutory_redundancy_pay) %> (<%= format_money(statutory_redundancy_pay_ni) %> in Northern Ireland).
+
+<% end %>
+
+<% govspeak_for :body do %>
+ ##How it’s worked out
+
+ Your employee's entitlement is <%= number_of_weeks_entitlement %> weeks.
+
+ They get:
+
+ + 0.5 week’s pay for each full year they were under 22
+ + 1 week’s pay for each full year they were 22 or older, but under 41
+ + 1.5 week’s pay for each full year they were 41 or older
+
+ Length of service is capped at 20 years and weekly pay at <%= format_money(rate) %> (<%= format_money(ni_rate) %> in Northern Ireland). Years of service or earnings over these amounts are not included in the calculation.
+
+ The maximum amount of statutory redundancy pay is <%= format_money(max_amount) %> (<%= format_money(ni_max_amount) %> in Northern Ireland).
+
+ ^Redundancy pay under £30,000 is not taxable.^
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Read the guide to Making staff redundant](https://www.gov.uk/staff-redundant)
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.govspeak.erb
deleted file mode 100644
index 6fe8662f6b2..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.govspeak.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% render_content_for :title do %>
- Statutory redundancy payment: <%= format_money(statutory_redundancy_pay) %> (<%= format_money(statutory_redundancy_pay_ni) %> in Northern Ireland).
-
-<% end %>
-
-<% render_content_for :body do %>
- ##How it’s worked out
-
- Your employee's entitlement is <%= number_of_weeks_entitlement %> weeks.
-
- They get:
-
- + 0.5 week’s pay for each full year they were under 22
- + 1 week’s pay for each full year they were 22 or older, but under 41
- + 1.5 week’s pay for each full year they were 41 or older
-
- Length of service is capped at 20 years and weekly pay at <%= format_money(rate) %> (<%= format_money(ni_rate) %> in Northern Ireland). Years of service or earnings over these amounts are not included in the calculation.
-
- The maximum amount of statutory redundancy pay is <%= format_money(max_amount) %> (<%= format_money(ni_max_amount) %> in Northern Ireland).
-
- ^Redundancy pay under £30,000 is not taxable.^
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Read the guide to Making staff redundant](https://www.gov.uk/staff-redundant)
-<% 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
new file mode 100644
index 00000000000..528cd41bf84
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Your employee is not entitled to statutory redundancy pay.
+<% end %>
+
+<% govspeak_for :body do %>
+ A minimum of 2 years’ continuous service is needed before an employee can get statutory redundancy pay.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Read the guide to Making staff redundant](https://www.gov.uk/staff-redundant)
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.govspeak.erb
deleted file mode 100644
index 24b58ea1e65..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Your employee is not entitled to statutory redundancy pay.
-<% end %>
-
-<% render_content_for :body do %>
- A minimum of 2 years’ continuous service is needed before an employee can get statutory redundancy pay.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Read the guide to Making staff redundant](https://www.gov.uk/staff-redundant)
-<% 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
new file mode 100644
index 00000000000..e6182a2fecb
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How old was your employee on the date they were made redundant?
+<% end %>
+
+<% text_for :suffix_label do %>
+ years old
+<% end %>
+
+<% 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/age_of_employee.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.govspeak.erb
deleted file mode 100644
index a6100a9f680..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How old was your employee on the date they were made redundant?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- years old
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..8d16627808d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What date was your employee made redundant?
+<% end %>
+
+<% 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/date_of_redundancy.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.govspeak.erb
deleted file mode 100644
index d53722b09ad..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What date was your employee made redundant?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..f4b7a00f382
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ What is their weekly pay before tax and any other deductions?
+<% end %>
+
+<% text_for :hint do %>
+ Examples of other deductions include student loans and child maintenance.
+<% end %>
+
+<% text_for :suffix_label do %>
+ per week
+<% end %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb
deleted file mode 100644
index 61572e74bca..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- What is their weekly pay before tax and any other deductions?
-<% end %>
-
-<% render_content_for :hint do %>
- Examples of other deductions include student loans and child maintenance.
-<% end %>
-
-<% render_content_for :suffix_label do %>
- per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..780d96ec8be
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Number of years they’ve worked for you
+<% end %>
+
+<% text_for :hint do %>
+ Only count full years of service. For example, 3 years and 9 months count as 3 years.
+<% end %>
+
+<% 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-employee-redundancy-pay/questions/years_employed.govspeak.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.govspeak.erb
deleted file mode 100644
index fc818173d94..00000000000
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Number of years they’ve worked for you
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..ef057f9241e
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Calculate your Married Couple's Allowance
+
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ You can use this calculator to work out if you qualify for Married Couple’s Allowance, and how much you might get. You need to be married or in a civil partnership to claim.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.govspeak.erb
deleted file mode 100644
index c34687a2a68..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Calculate your Married Couple's Allowance
-
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- You can use this calculator to work out if you qualify for Married Couple’s Allowance, and how much you might get. You need to be married or in a civil partnership to claim.
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_body.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_body.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_body.govspeak.erb
rename to lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_body.erb
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_next_steps.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_next_steps.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_next_steps.govspeak.erb
rename to lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/_done_next_steps.erb
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
new file mode 100644
index 00000000000..9125872fc4c
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The highest earner qualifies for Married Couple's Allowance - they'll get <%= format_money(allowance) %> off their tax bill.
+<% end %>
+
+<% govspeak_for :body do %>
+ <%= render partial: 'done_body' %>
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'done_next_steps' %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.govspeak.erb
deleted file mode 100644
index 554d4d7b4a3..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The highest earner qualifies for Married Couple's Allowance - they'll get <%= format_money(allowance) %> off their tax bill.
-<% end %>
-
-<% render_content_for :body do %>
- <%= render partial: 'done_body.govspeak.erb' %>
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'done_next_steps.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..56fd1f494b7
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The husband qualifies for Married Couple's Allowance - he'll get <%= format_money(allowance) %> off his tax bill.
+<% end %>
+
+<% govspeak_for :body do %>
+ <%= render partial: 'done_body' %>
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'done_next_steps' %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.govspeak.erb
deleted file mode 100644
index e752691eaca..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The husband qualifies for Married Couple's Allowance - he'll get <%= format_money(allowance) %> off his tax bill.
-<% end %>
-
-<% render_content_for :body do %>
- <%= render partial: 'done_body.govspeak.erb' %>
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'done_next_steps.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..fd2ef9264e2
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You don't qualify for Married Couple's Allowance.
+<% end %>
+
+<% govspeak_for :body do %>
+ You or your partner had to be born before 6 April 1935 to be [eligible for Married Couple's Allowance](/married-couples-allowance/eligibility).
+
+ If you and your partner were born on or after 6 April 1935, you may be able to claim [Marriage Allowance](/marriage-allowance) instead.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.govspeak.erb
deleted file mode 100644
index 407efd4d93f..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You don't qualify for Married Couple's Allowance.
-<% end %>
-
-<% render_content_for :body do %>
- You or your partner had to be born before 6 April 1935 to be [eligible for Married Couple's Allowance](/married-couples-allowance/eligibility).
-
- If you and your partner were born on or after 6 April 1935, you may be able to claim [Marriage Allowance](/marriage-allowance) instead.
-<% 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
new file mode 100644
index 00000000000..82fb6fec4b1
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Did you marry before 5 December 2005?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please choose 'Yes' or 'No'
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.govspeak.erb
deleted file mode 100644
index 7c2b34a71cc..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Did you marry before 5 December 2005?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..5e0964b4191
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% 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 %>
+
+<% 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_before_tax.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.govspeak.erb
deleted file mode 100644
index 7b6a757e3dc..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..4187d51341b
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% text_for :hint do %>
+ Only enter what you pay - don’t include the tax relief. If none, please enter 0.
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.govspeak.erb
deleted file mode 100644
index 8198caba780..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- Only enter what you pay - don’t include the tax relief. If none, please enter 0.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..30e8c1b7bc8
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much do you expect to donate to charity through Gift Aid during the entire tax year?
+<% end %>
+
+<% text_for :hint do %>
+ Only enter what you pay - don’t include any tax relief. If none, please enter 0.
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.govspeak.erb
deleted file mode 100644
index ef2d9e1613d..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- Only enter what you pay - don’t include any tax relief. If none, please enter 0.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..98cfd6ef907
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you paying into a pension?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.govspeak.erb
deleted file mode 100644
index ae26bc89642..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you paying into a pension?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..0fecc6bae74
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Were you or your partner born before 6 April 1935?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
+
+<% text_for :hint do %>
+ You must be married or in a civil partnership to qualify.
+<% end %>
+
+<% text_for :error_message do %>
+ Please choose 'Yes' or 'No'
+<% 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.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.govspeak.erb
deleted file mode 100644
index d1d0ca56724..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Were you or your partner born before 6 April 1935?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
-
-<% render_content_for :hint do %>
- You must be married or in a civil partnership to qualify.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..d18bdff314d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What's the highest earner's date of birth?
+<% end %>
+
+<% 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 %>
+
+<% 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_date_of_birth.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.govspeak.erb
deleted file mode 100644
index c0faf28cbbb..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What's the highest earner's date of birth?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..08695c62793
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What's the highest earner's yearly income?
+<% end %>
+
+<% text_for :hint do %>
+ Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer's Allowance.
+<% end %>
+
+<% 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_highest_earners_income.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.govspeak.erb
deleted file mode 100644
index be26f8d631b..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What's the highest earner's yearly income?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..ff5d8d40c25
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What's the husband's date of birth?
+<% end %>
+
+<% 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 %>
+
+<% 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_date_of_birth.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.govspeak.erb
deleted file mode 100644
index 0e2efdfd4a2..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What's the husband's date of birth?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..450fe197ac6
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What's the husband's yearly income?
+<% end %>
+
+<% text_for :hint do %>
+ Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer’s Allowance.
+<% end %>
+
+<% 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_income.govspeak.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.govspeak.erb
deleted file mode 100644
index a375af8239a..00000000000
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What's the husband's yearly income?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..ae56ba745d2
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.erb
@@ -0,0 +1,30 @@
+<% text_for :title do %>
+ Calculate your employee's statutory sick pay
+<% end %>
+
+<% text_for :meta_description do %>
+ Statutory Sick Pay (SSP) calculator - calculate SSP for an employee
+<% end %>
+
+<% govspeak_for :body do %>
+ Calculate Statutory Sick Pay (SSP) for your employee.
+
+ ##What you need to know
+
+ You’re only responsible for paying SSP if:
+
+ - you pay Class 1 National Insurance contributions for your employee (or would do if not for their age or their level of earnings)
+ - your employee was sick for 4 or more days in a row (including non-working days)
+ - your employee has told you they’re sick within your own time limit (or 7 days if you do not have one)
+
+ ^ You cannot use the calculator for periods of sickness before 6 April 2011.^
+
+ *[SSP]: Statutory Sick Pay
+
+ ###Different periods of sick leave
+
+ You can combine periods of sick leave if the gap between them is 8 weeks or less. These are called ‘linked Periods of Incapacity for Work (PIW)’.
+
+ If there’s more than one linked PIW, you’ll need to [work out the SSP manually](/guidance/statutory-sick-pay-manually-calculate-your-employees-payments#link-period-of-incapacity-for-work).
+
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.govspeak.erb
deleted file mode 100644
index e0441c69008..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.govspeak.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<% render_content_for :title do %>
- Calculate your employee's statutory sick pay
-<% end %>
-
-<% render_content_for :meta_description do %>
- Statutory Sick Pay (SSP) calculator - calculate SSP for an employee
-<% end %>
-
-<% render_content_for :body do %>
- Calculate Statutory Sick Pay (SSP) for your employee.
-
- ##What you need to know
-
- You’re only responsible for paying SSP if:
-
- - you pay Class 1 National Insurance contributions for your employee (or would do if not for their age or their level of earnings)
- - your employee was sick for 4 or more days in a row (including non-working days)
- - your employee has told you they’re sick within your own time limit (or 7 days if you do not have one)
-
- ^ You cannot use the calculator for periods of sickness before 6 April 2011.^
-
- *[SSP]: Statutory Sick Pay
-
- ###Different periods of sick leave
-
- You can combine periods of sick leave if the gap between them is 8 weeks or less. These are called ‘linked Periods of Incapacity for Work (PIW)’.
-
- If there’s more than one linked PIW, you’ll need to [work out the SSP manually](/guidance/statutory-sick-pay-manually-calculate-your-employees-payments#link-period-of-incapacity-for-work).
-
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.erb
new file mode 100644
index 00000000000..8b8f9889060
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ Your employee isn’t entitled to statutory sick pay because they’re already receiving Statutory Maternity Pay or Maternity Allowance.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.govspeak.erb
deleted file mode 100644
index 95a5049e874..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/already_getting_maternity.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- Your employee isn’t entitled to statutory sick pay because they’re already receiving Statutory Maternity Pay or Maternity Allowance.
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.erb
new file mode 100644
index 00000000000..264fa77a4c4
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.erb
@@ -0,0 +1,31 @@
+<% govspeak_for :body do %>
+ ##Statutory Sick Pay (SSP)
+
+ Your employee is entitled to SSP for <%= days_paid %> days out of <%= normal_workdays_out %> working days taken off sick between <%= format_date(calculator.sick_start_date) %> and <%= format_date(calculator.sick_end_date) %>
+
+ <% unless calculator.enough_notice_of_absence %>
+ You don’t have to pay until your employee tells you that they’re ill. You’ll have to pay any withheld amounts by the end of your employee's entitlement to sick pay if your employee is sick for more than 28 weeks.
+ <% end %>
+
+
+ Week ending | SSP amount
+ -|-
+ <% calculator.weekly_payments.each do |week_ending, ssp_amount| %>
+ <%= format_date(week_ending) %>|<%= format_money(ssp_amount) %>
+ <% end %>
+ | **Total SSP: <%= format_money(ssp_payment) %>**
+
+ ##What you need to know
+
+ <% if calculator.paternity_maternity_warning? %>
+ ^ Your employee will not be able to collect Statutory Shared Parental Pay, Statutory Paternity Pay, Statutory Parental Bereavement Pay or Statutory Adoption Pay while collecting Statutory Sick Pay. ^
+ <% end %>
+
+ SSP can be paid for up to 28 weeks of an employee’s normal workdays. For this employee that equals a total of <%= pattern_days_total %> days. After that you must give them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) within 7 days of SSP ending. <% if calculator.enough_notice_of_absence %>They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).<% end %>
+
+
+
+ There are also [records you must keep](/sick-leave-pay-employees/entitlement) and rules on [proof of illness](/sick-leave-pay-employees/notice-and-fit-notes) you can ask for.
+
+ *[SSP]: Statutory Sick Pay
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.govspeak.erb
deleted file mode 100644
index c49374b37e6..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/entitled_to_sick_pay.govspeak.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% render_content_for :body do %>
- ##Statutory Sick Pay (SSP)
-
- Your employee is entitled to SSP for <%= days_paid %> days out of <%= normal_workdays_out %> working days taken off sick between <%= format_date(calculator.sick_start_date) %> and <%= format_date(calculator.sick_end_date) %>
-
- <% unless calculator.enough_notice_of_absence %>
- You don’t have to pay until your employee tells you that they’re ill. You’ll have to pay any withheld amounts by the end of your employee's entitlement to sick pay if your employee is sick for more than 28 weeks.
- <% end %>
-
-
- Week ending | SSP amount
- -|-
- <% calculator.weekly_payments.each do |week_ending, ssp_amount| %>
- <%= format_date(week_ending) %>|<%= format_money(ssp_amount) %>
- <% end %>
- | **Total SSP: <%= format_money(ssp_payment) %>**
-
- ##What you need to know
-
- <% if calculator.paternity_maternity_warning? %>
- ^ Your employee will not be able to collect Statutory Shared Parental Pay, Statutory Paternity Pay, Statutory Parental Bereavement Pay or Statutory Adoption Pay while collecting Statutory Sick Pay. ^
- <% end %>
-
- SSP can be paid for up to 28 weeks of an employee’s normal workdays. For this employee that equals a total of <%= pattern_days_total %> days. After that you must give them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) within 7 days of SSP ending. <% if calculator.enough_notice_of_absence %>They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).<% end %>
-
-
-
- There are also [records you must keep](/sick-leave-pay-employees/entitlement) and rules on [proof of illness](/sick-leave-pay-employees/notice-and-fit-notes) you can ask for.
-
- *[SSP]: Statutory Sick Pay
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.erb
new file mode 100644
index 00000000000..81314f3cef3
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ Your employee isn’t entitled to Statutory Sick Pay because they’ve already received the maximum amount of SSP (28 weeks).
+
+ You must send them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) within 7 days of them going off sick. They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.govspeak.erb
deleted file mode 100644
index 71abda70b2a..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/maximum_entitlement_reached.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- Your employee isn’t entitled to Statutory Sick Pay because they’ve already received the maximum amount of SSP (28 weeks).
-
- You must send them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) within 7 days of them going off sick. They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.erb
new file mode 100644
index 00000000000..93fbd243739
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ Your employee must be sick for at least 4 days in a row to get Statutory Sick Pay.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.govspeak.erb
deleted file mode 100644
index d1e40dfeee2..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/must_be_sick_for_4_days.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- Your employee must be sick for at least 4 days in a row to get Statutory Sick Pay.
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.erb
new file mode 100644
index 00000000000..2935f67a639
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ Your employee isn’t entitled to Statutory Sick Pay because their average weekly earnings must be at least <%= format_money(lower_earning_limit) %>. Their average weekly earnings are <%= format_money(employee_average_weekly_earnings) %>.
+
+ You must send them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) no more than 7 days after they’ve told you they’re sick. They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.govspeak.erb
deleted file mode 100644
index 7b8d0529153..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_earned_enough.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- Your employee isn’t entitled to Statutory Sick Pay because their average weekly earnings must be at least <%= format_money(lower_earning_limit) %>. Their average weekly earnings are <%= format_money(employee_average_weekly_earnings) %>.
-
- You must send them [form SSP1](/employers-sick-pay/eligibility-and-form-ssp1) no more than 7 days after they’ve told you they’re sick. They may be able to get [Employment Support Allowance (ESA)](/employment-support-allowance).
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.erb
new file mode 100644
index 00000000000..af323da1450
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ Your employee isn’t entitled to Statutory Sick Pay because the first 3 days of illness aren’t paid.
+
+ This employee has taken <%= normal_workdays_out %> working days off sick between <%= format_date(calculator.sick_start_date) %> and <%= format_date(calculator.sick_end_date) %>.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.govspeak.erb
deleted file mode 100644
index b9a070fdd9b..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_entitled_3_days_not_paid.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- Your employee isn’t entitled to Statutory Sick Pay because the first 3 days of illness aren’t paid.
-
- This employee has taken <%= normal_workdays_out %> working days off sick between <%= format_date(calculator.sick_start_date) %> and <%= format_date(calculator.sick_end_date) %>.
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.erb
new file mode 100644
index 00000000000..0f859ad03a4
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ If your employee has an irregular work schedule, you’ll need to [work out Statutory Sick Pay manually](/statutory-sick-pay-manually-calculate-your-employees-payments).
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.govspeak.erb
deleted file mode 100644
index af0a7d45fa8..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/outcomes/not_regular_schedule.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- If your employee has an irregular work schedule, you’ll need to [work out Statutory Sick Pay manually](/statutory-sick-pay-manually-calculate-your-employees-payments).
-<% 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
new file mode 100644
index 00000000000..200d2e105fe
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many days does the period represented by these earnings cover?
+<% end %>
+
+<% text_for :hint do %>
+ If it’s 2 weeks and 3 days enter ‘17’.
+<% end %>
+
+<% 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/contractual_days_covered_by_earnings.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.govspeak.erb
deleted file mode 100644
index 332a85c3fab..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many days does the period represented by these earnings cover?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..41e0ee8d86a
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.erb
@@ -0,0 +1,8 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.govspeak.erb
deleted file mode 100644
index 8c6f2280673..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..c8eade0ac83
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your employee off work because of coronavirus (COVID‑19)?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.govspeak.erb
deleted file mode 100644
index 2d4724b9083..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your employee off work because of coronavirus (COVID‑19)?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..62e6a290c7e
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Has your employee or someone they live with got symptoms of coronavirus (COVID‑19)?
+<% end %>
+
+<% options(
+ self: "They have symptoms",
+ cohabitant: "They live with someone who has symptoms"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.govspeak.erb
deleted file mode 100644
index a5a3a3737d0..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Has your employee or someone they live with got symptoms of coronavirus (COVID‑19)?
-<% end %>
-
-<% options(
- self: "They have symptoms",
- cohabitant: "They live with someone who has symptoms"
-) %>
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
new file mode 100644
index 00000000000..e0f3bdfa6df
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How many days does the period represented by these earnings cover?
+<% end %>
+
+<% 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/days_covered_by_earnings.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.govspeak.erb
deleted file mode 100644
index 571658b79e5..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How many days does the period represented by these earnings cover?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a1746425d84
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.erb
@@ -0,0 +1,8 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.govspeak.erb
deleted file mode 100644
index 9b3425bcd05..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..aed88e9bf13
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does your employee routinely work different days of the week?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.govspeak.erb
deleted file mode 100644
index 0bb46cf1532..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does your employee routinely work different days of the week?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..f9213704e1d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ During their most recent period of sickness, when did your employee first become sick?
+<% end %>
+
+<% 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/first_sick_day.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.govspeak.erb
deleted file mode 100644
index a5bfb8f9947..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- During their most recent period of sickness, when did your employee first become sick?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..6639388a061
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.erb
@@ -0,0 +1,15 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ These are called ‘linked Periods of Incapacity for Work (PIW)’. Check if an employee’s [PIW links to a previous one.](/government/publications/statutory-sick-pay-tables-for-linking-periods-of-incapacity-for-work)
+
+ *[PIW]: Period of Incapacity for Work
+
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.govspeak.erb
deleted file mode 100644
index 09cce49cba3..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- These are called ‘linked Periods of Incapacity for Work (PIW)’. Check if an employee’s [PIW links to a previous one.](/government/publications/statutory-sick-pay-tables-for-linking-periods-of-incapacity-for-work)
-
- *[PIW]: Period of Incapacity for Work
-
-<% 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
new file mode 100644
index 00000000000..62b3d231a8b
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often do you pay the employee?
+<% end %>
+
+<% options(
+ "weekly": "Weekly",
+ "fortnightly": "Every 2 weeks",
+ "every_4_weeks": "Every 4 weeks",
+ "monthly": "Monthly - eg last day or Friday of a month",
+ "irregularly": "Irregularly"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.govspeak.erb
deleted file mode 100644
index 13c8a320ac1..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay the employee?
-<% end %>
-
-<% options(
- "weekly": "Weekly",
- "fortnightly": "Every 2 weeks",
- "every_4_weeks": "Every 4 weeks",
- "monthly": "Monthly - eg last day or Friday of a month",
- "irregularly": "Irregularly"
-) %>
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
new file mode 100644
index 00000000000..9ca501aeb5e
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Is your employee getting any of the following?
+<% end %>
+
+<% options(
+ "statutory_maternity_pay": "Statutory Maternity Pay",
+ "maternity_allowance": "Maternity Allowance",
+ "statutory_paternity_pay": "Statutory Paternity Pay",
+ "statutory_adoption_pay": "Statutory Adoption Pay",
+ "statutory_parental_bereavement_pay": "Statutory Parental Bereavement Pay",
+ "shared_parental_leave_and_pay": "Shared Parental Leave and Pay"
+) %>
+
+<% text_for :hint do %>
+ If none apply just click ‘Next step’
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.govspeak.erb
deleted file mode 100644
index b97b129c6c0..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Is your employee getting any of the following?
-<% end %>
-
-<% options(
- "statutory_maternity_pay": "Statutory Maternity Pay",
- "maternity_allowance": "Maternity Allowance",
- "statutory_paternity_pay": "Statutory Paternity Pay",
- "statutory_adoption_pay": "Statutory Adoption Pay",
- "statutory_parental_bereavement_pay": "Statutory Parental Bereavement Pay",
- "shared_parental_leave_and_pay": "Shared Parental Leave and Pay"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..61b5980933c
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What was the last normal payday on or before <%= format_date(pay_day_offset) %>?
+<% end %>
+
+<% 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_offset.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.govspeak.erb
deleted file mode 100644
index ea0aa68847a..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday on or before <%= format_date(pay_day_offset) %>?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..cbd10374026
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday before <%= format_date(sick_start_date_for_awe) %>?
+<% end %>
+
+<% 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 %>
+
+<% 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_payday_before_sickness.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.govspeak.erb
deleted file mode 100644
index c11cfe433d0..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday before <%= format_date(sick_start_date_for_awe) %>?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..580997eb734
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Enter the last day of sickness
+<% end %>
+
+<% text_for :hint do %>
+ This can include non-working days and bank holidays
+<% end %>
+
+<% 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/last_sick_day.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.govspeak.erb
deleted file mode 100644
index 363cb50a0eb..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Enter the last day of sickness
-<% end %>
-
-<% render_content_for :hint do %>
- This can include non-working days and bank holidays
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..9572f6eb7be
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Enter the end date for this linked period of sickness.
+<% end %>
+
+<% 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 %>
+<% 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 %>
+<% 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_end_date.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.govspeak.erb
deleted file mode 100644
index a1b5db5a0a6..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_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 %>
- The linked period of sickness must be at least 4 calendar days long.
-<% end %>
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..e4fc81726d5
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ Enter the start date for this linked period of sickness.
+<% end %>
+
+<% 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/linked_sickness_start_date.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.govspeak.erb
deleted file mode 100644
index 629893e5309..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- Enter the start date for this linked period of sickness.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..9c26f4c9aa7
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ On <%= format_date(sick_start_date_for_awe) %> had you paid your employee at least 8 weeks of earnings?
+<% end %>
+
+<% options(
+ "eight_weeks_more": "Yes, paid at least 8 weeks earnings",
+ "eight_weeks_less": "No, paid less than 8 weeks earnings",
+ "before_payday": "No, employee is new and fell sick before their first payday"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.govspeak.erb
deleted file mode 100644
index ed1e4b27d15..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- On <%= format_date(sick_start_date_for_awe) %> had you paid your employee at least 8 weeks of earnings?
-<% end %>
-
-<% options(
- "eight_weeks_more": "Yes, paid at least 8 weeks earnings",
- "eight_weeks_less": "No, paid less than 8 weeks earnings",
- "before_payday": "No, employee is new and fell sick before their first payday"
-) %>
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
new file mode 100644
index 00000000000..4ce44f89682
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.erb
@@ -0,0 +1,3 @@
+<% 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/pay_amount_if_not_sick.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.govspeak.erb
deleted file mode 100644
index c47fcc0cc62..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..967422a8e30
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.erb
@@ -0,0 +1,3 @@
+<% 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_earnings_before_sick_period.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.govspeak.erb
deleted file mode 100644
index 99d2f3b81a2..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..f0abb6d49ab
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Different rules apply for [directors of limited companies incorporated before 1 October 2009](/statutory-sick-pay-how-different-employment-types-affect-what-you-pay)
+
+<% end %>
+
+<% 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/total_employee_earnings.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.govspeak.erb
deleted file mode 100644
index aa70af3caba..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Different rules apply for [directors of limited companies incorporated before 1 October 2009](/statutory-sick-pay-how-different-employment-types-affect-what-you-pay)
-
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..80a2ca5d412
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Which days of the week do they usually work?
+<% end %>
+
+<% options(
+ "1": "Monday",
+ "2": "Tuesday",
+ "3": "Wednesday",
+ "4": "Thursday",
+ "5": "Friday",
+ "6": "Saturday",
+ "0": "Sunday"
+) %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.govspeak.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.govspeak.erb
deleted file mode 100644
index 9b54675e05e..00000000000
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Which days of the week do they usually work?
-<% end %>
-
-<% options(
- "1": "Monday",
- "2": "Tuesday",
- "3": "Wednesday",
- "4": "Thursday",
- "5": "Friday",
- "6": "Saturday",
- "0": "Sunday"
-) %>
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
new file mode 100644
index 00000000000..139d598b94d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Calculate holiday entitlement
+<% end %>
+
+<% text_for :meta_description do %>
+ Holiday calculator to work out statutory holiday leave in days or hours
+<% end %>
+
+<% govspeak_for :body do %>
+ Use this tool to calculate holiday entitlement for:
+
+ - a full leave year
+ - part of a leave year, if the job started or finished part way through the year
+
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.govspeak.erb
deleted file mode 100644
index 50b32592afa..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Calculate holiday entitlement
-<% end %>
-
-<% render_content_for :meta_description do %>
- Holiday calculator to work out statutory holiday leave in days or hours
-<% end %>
-
-<% render_content_for :body do %>
- Use this tool to calculate holiday entitlement for:
-
- - a full leave year
- - part of a leave year, if the job started or finished part way through the year
-
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_entitlement_restriction.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_entitlement_restriction.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_entitlement_restriction.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_entitlement_restriction.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_guidance_on_calculations.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_guidance_on_calculations.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_guidance_on_calculations.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_guidance_on_calculations.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_irregular_and_annualised_user_awareness.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_irregular_and_annualised_user_awareness.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_irregular_and_annualised_user_awareness.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_irregular_and_annualised_user_awareness.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_shift_worker_your_employer_with_rounding.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_shift_worker_your_employer_with_rounding.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_shift_worker_your_employer_with_rounding.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_shift_worker_your_employer_with_rounding.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_the_user_should_be_aware.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_the_user_should_be_aware.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_the_user_should_be_aware.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_the_user_should_be_aware.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_your_employer_with_rounding.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_your_employer_with_rounding.erb
similarity index 100%
rename from lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_your_employer_with_rounding.govspeak.erb
rename to lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/_your_employer_with_rounding.erb
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.erb
new file mode 100644
index 00000000000..3180b6be8f2
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.erb
@@ -0,0 +1,10 @@
+<% govspeak_for :body do %>
+ $!The statutory holiday entitlement is <%= "#{holiday_entitlement_hours} #{'hour'.pluralize(holiday_entitlement_hours)}" %> and <%= "#{holiday_entitlement_minutes} #{'minute'.pluralize(holiday_entitlement_minutes)}" %> holiday for the year. Rather than taking a day’s holiday it’s <%= "#{hours_daily} #{'hour'.pluralize(hours_daily)}" %> and <%= "#{minutes_daily} #{'minute'.pluralize(minutes_daily)}" %> holiday for each day otherwise worked.$!
+
+ <%= render partial: 'your_employer_with_rounding' %>
+ <% if holiday_period == "starting" %>
+ <%= render partial: "the_user_should_be_aware" %>
+ <% end %>
+
+ <%= render partial: "guidance_on_calculations" %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.govspeak.erb
deleted file mode 100644
index 3ff20894ab7..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_hours_done.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :body do %>
- $!The statutory holiday entitlement is <%= "#{holiday_entitlement_hours} #{'hour'.pluralize(holiday_entitlement_hours)}" %> and <%= "#{holiday_entitlement_minutes} #{'minute'.pluralize(holiday_entitlement_minutes)}" %> holiday for the year. Rather than taking a day’s holiday it’s <%= "#{hours_daily} #{'hour'.pluralize(hours_daily)}" %> and <%= "#{minutes_daily} #{'minute'.pluralize(minutes_daily)}" %> holiday for each day otherwise worked.$!
-
- <%= render partial: 'your_employer_with_rounding.govspeak.erb' %>
- <% if holiday_period == "starting" %>
- <%= render partial: "the_user_should_be_aware.govspeak.erb" %>
- <% end %>
-
- <%= render partial: "guidance_on_calculations.govspeak.erb" %>
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.erb
new file mode 100644
index 00000000000..424392b6aae
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ $!The statutory holiday entitlement is <%= "#{holiday_entitlement_days} #{'day'.pluralize(holiday_entitlement_days)}" %> holiday.$!
+
+ <% if working_days_per_week > 5 %>
+ Even though more than 5 days a week are worked, the maximum statutory holiday entitlement is 28 days.
+ <% end %>
+
+ <%= render partial: "your_employer_with_rounding" %>
+
+ <% if holiday_period == "starting" %>
+ <%= render partial: "the_user_should_be_aware" %>
+ <% end %>
+
+ <%= render partial: "guidance_on_calculations" %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.govspeak.erb
deleted file mode 100644
index 84013428965..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- $!The statutory holiday entitlement is <%= "#{holiday_entitlement_days} #{'day'.pluralize(holiday_entitlement_days)}" %> holiday.$!
-
- <% if working_days_per_week > 5 %>
- Even though more than 5 days a week are worked, the maximum statutory holiday entitlement is 28 days.
- <% end %>
-
- <%= render partial: "your_employer_with_rounding.govspeak.erb" %>
-
- <% if holiday_period == "starting" %>
- <%= render partial: "the_user_should_be_aware.govspeak.erb" %>
- <% end %>
-
- <%= render partial: "guidance_on_calculations.govspeak.erb" %>
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.erb
new file mode 100644
index 00000000000..b32ccce1504
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ $!The statutory entitlement is <%= "#{holiday_entitlement_hours} #{'hour'.pluralize(holiday_entitlement_hours)}" %> holiday.$!
+
+ <% if working_days_per_week > 5 %>
+ Even though more than 5 days a week are worked the maximum statutory holiday entitlement is 28 days.
+ <% end %>
+
+ <%= render partial: 'your_employer_with_rounding' %>
+
+ <% if holiday_period == "starting" %>
+ <%= render partial: "the_user_should_be_aware" %>
+ <% end %>
+
+ <%= render partial: "guidance_on_calculations" %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.govspeak.erb
deleted file mode 100644
index d0a9d96a525..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- $!The statutory entitlement is <%= "#{holiday_entitlement_hours} #{'hour'.pluralize(holiday_entitlement_hours)}" %> holiday.$!
-
- <% if working_days_per_week > 5 %>
- Even though more than 5 days a week are worked the maximum statutory holiday entitlement is 28 days.
- <% end %>
-
- <%= render partial: 'your_employer_with_rounding.govspeak.erb' %>
-
- <% if holiday_period == "starting" %>
- <%= render partial: "the_user_should_be_aware.govspeak.erb" %>
- <% end %>
-
- <%= render partial: "guidance_on_calculations.govspeak.erb" %>
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.erb
new file mode 100644
index 00000000000..eee31ed2226
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ The statutory holiday entitlement is <%= holiday_entitlement %> weeks holiday.
+
+ There are no regulations on how to convert the entitlement into days or hours for workers with irregular hours.
+
+ You may wish to [use the calculator again](/calculate-your-holiday-entitlement/y) and calculate the average days or hours worked each week based on a representative reference period instead.
+
+ <%= render partial: 'your_employer_with_rounding' %>
+
+ <% if holiday_period == 'starting' %>
+ <%= render partial: 'irregular_and_annualised_user_awareness' %>
+ <% else %>
+ <%= render partial: 'entitlement_restriction' %>
+ <% end %>
+
+ <%= render partial: "guidance_on_calculations" %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.govspeak.erb
deleted file mode 100644
index 5f4da0971dd..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/irregular_and_annualised_done.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- The statutory holiday entitlement is <%= holiday_entitlement %> weeks holiday.
-
- There are no regulations on how to convert the entitlement into days or hours for workers with irregular hours.
-
- You may wish to [use the calculator again](/calculate-your-holiday-entitlement/y) and calculate the average days or hours worked each week based on a representative reference period instead.
-
- <%= render partial: 'your_employer_with_rounding.govspeak.erb' %>
-
- <% if holiday_period == 'starting' %>
- <%= render partial: 'irregular_and_annualised_user_awareness.govspeak.erb' %>
- <% else %>
- <%= render partial: 'entitlement_restriction.govspeak.erb' %>
- <% end %>
-
- <%= render partial: "guidance_on_calculations.govspeak.erb" %>
-<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.erb
new file mode 100644
index 00000000000..e53a57330dc
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.erb
@@ -0,0 +1,14 @@
+<% govspeak_for :body do %>
+ $!The statutory holiday entitlement is <%= "#{holiday_entitlement_shifts} #{'shift'.pluralize(holiday_entitlement_shifts)}" %> for the year. Each shift being <%= "#{hours_per_shift} #{'hour'.pluralize(hours_per_shift)}" %>.$!
+
+ <% if shifts_per_week > 5 %>
+ Even though more than 5 shifts a week are worked the maximum statutory holiday entitlement is 28 shifts.
+ <% end %>
+
+ <%= render partial: 'shift_worker_your_employer_with_rounding' %>
+ <% if holiday_period == "starting" %>
+ <%= render partial: "the_user_should_be_aware" %>
+ <% end %>
+
+ <%= render partial: "guidance_on_calculations" %>
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.govspeak.erb
deleted file mode 100644
index 359972cd851..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :body do %>
- $!The statutory holiday entitlement is <%= "#{holiday_entitlement_shifts} #{'shift'.pluralize(holiday_entitlement_shifts)}" %> for the year. Each shift being <%= "#{hours_per_shift} #{'hour'.pluralize(hours_per_shift)}" %>.$!
-
- <% if shifts_per_week > 5 %>
- Even though more than 5 shifts a week are worked the maximum statutory holiday entitlement is 28 shifts.
- <% end %>
-
- <%= render partial: 'shift_worker_your_employer_with_rounding.govspeak.erb' %>
- <% if holiday_period == "starting" %>
- <%= render partial: "the_user_should_be_aware.govspeak.erb" %>
- <% end %>
-
- <%= render partial: "guidance_on_calculations.govspeak.erb" %>
-<% 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
new file mode 100644
index 00000000000..1501e849982
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Is the holiday entitlement based on:
+<% end %>
+
+<% options(
+ "days-worked-per-week": "days worked per week",
+ "hours-worked-per-week": "hours worked per week",
+ "irregular-hours": "casual or irregular hours, including zero hours contracts",
+ "annualised-hours": "annualised hours",
+ "compressed-hours": "compressed hours",
+ "shift-worker": "shifts"
+) %>
+
+<% 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/basis_of_calculation.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb
deleted file mode 100644
index a729daf9ab2..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Is the holiday entitlement based on:
-<% end %>
-
-<% options(
- "days-worked-per-week": "days worked per week",
- "hours-worked-per-week": "hours worked per week",
- "irregular-hours": "casual or irregular hours, including zero hours contracts",
- "annualised-hours": "annualised hours",
- "compressed-hours": "compressed hours",
- "shift-worker": "shifts"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..efb249c3d14
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Do you want to work out holiday:
+<% end %>
+
+<% options(
+ "full-year": "for a full leave year",
+ "starting": "for someone starting part way through a leave year",
+ "leaving": "for someone leaving part way through a leave year",
+ "starting-and-leaving": "for someone starting and leaving part way through a leave year"
+) %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb
deleted file mode 100644
index e5736d64bf0..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Do you want to work out holiday:
-<% end %>
-
-<% options(
- "full-year": "for a full leave year",
- "starting": "for someone starting part way through a leave year",
- "leaving": "for someone leaving part way through a leave year",
- "starting-and-leaving": "for someone starting and leaving part way through a leave year"
-) %>
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
new file mode 100644
index 00000000000..502a0e5941c
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Number of days per week worked?
+<% end %>
+
+<% text_for :label do %>
+ Days per week
+<% end %>
+
+<% 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_days_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb
deleted file mode 100644
index 622d945fcb2..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Number of days per week worked?
-<% end %>
-
-<% render_content_for :label do %>
- Days per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..b086cd42882
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many hours are worked per week?
+<% end %>
+
+<% text_for :label do %>
+ Hours per week
+<% end %>
+
+<% 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/compressed_hours_how_many_hours_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb
deleted file mode 100644
index f807ee992a4..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many hours are worked per week?
-<% end %>
-
-<% render_content_for :label do %>
- Hours per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..100386757e0
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Number of days worked per week?
+<% end %>
+
+<% 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 %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
deleted file mode 100644
index 67b000f05d9..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Number of days worked per week?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..a4f3830ff60
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Number of days worked per week?
+<% end %>
+
+<% 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 %>
+
+<% 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 %>
+
+<% 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_days_per_week_for_hours.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.govspeak.erb
deleted file mode 100644
index c563ecca72e..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Number of days worked per week?
-<% end %>
-
-<% render_content_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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..bf56bb28e5a
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Number of hours worked per week?
+<% end %>
+
+<% text_for :hint do %>
+ Include half-hours, for example 40.5.
+<% end %>
+
+<% 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 %>
+
+<% 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/how_many_hours_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb
deleted file mode 100644
index 7cb6dd3ad5c..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Number of hours worked per week?
-<% end %>
-
-<% render_content_for :hint do %>
- Include half-hours, for example 40.5.
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..65305791aff
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Do you want to calculate the holiday:
+<% end %>
+
+<% options(
+ "full-year": "for a full leave year",
+ "starting": "for someone starting part way through a leave year",
+ "leaving": "for someone leaving part way through a leave year",
+ "starting-and-leaving": "for someone starting and leaving part way through a leave year"
+) %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb
deleted file mode 100644
index f99857cd15b..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Do you want to calculate the holiday:
-<% end %>
-
-<% options(
- "full-year": "for a full leave year",
- "starting": "for someone starting part way through a leave year",
- "leaving": "for someone leaving part way through a leave year",
- "starting-and-leaving": "for someone starting and leaving part way through a leave year"
-) %>
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
new file mode 100644
index 00000000000..f1ec4a31bbe
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ How many days in the shift pattern?
+<% end %>
+
+<% text_for :hint do %>
+ The shift pattern includes non-working days.
+<% end %>
+
+<% text_for :label do %>
+ Days per pattern
+<% end %>
+
+<% 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_days_per_shift_pattern.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb
deleted file mode 100644
index 04bb731896f..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- How many days in the shift pattern?
-<% end %>
-
-<% render_content_for :hint do %>
- The shift pattern includes non-working days.
-<% end %>
-
-<% render_content_for :label do %>
- Days per pattern
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..6683b66285d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ How many hours in each shift?
+<% end %>
+
+<% text_for :label do %>
+ Hours per shift
+<% end %>
+
+<% 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 %>
+
+<% 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_hours_per_shift.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb
deleted file mode 100644
index 7567499b855..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- How many hours in each shift?
-<% end %>
-
-<% render_content_for :label do %>
- Hours per shift
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..8b9256e7704
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many shifts will be worked per shift pattern?
+<% end %>
+
+<% text_for :label do %>
+ Shifts per pattern
+<% end %>
+
+<% 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/shift_worker_shifts_per_shift_pattern.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb
deleted file mode 100644
index 22e393a4dc3..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many shifts will be worked per shift pattern?
-<% end %>
-
-<% render_content_for :label do %>
- Shifts per pattern
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..dd2c4139916
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What was the employment end date?
+<% end %>
+
+<% if start_date %>
+ <% 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 %>
+
+ <% 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_leaving_date.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb
deleted file mode 100644
index 9beaaddd6ff..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What was the employment end date?
-<% end %>
-
-<% if start_date %>
- <% render_content_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 %>
- 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
new file mode 100644
index 00000000000..5984eccb261
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ What was the employment start date?
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb
deleted file mode 100644
index adea58b7c73..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..c3191e0dd3a
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.erb
@@ -0,0 +1,27 @@
+<% text_for :title do %>
+ When does the leave year start?
+<% end %>
+
+<% 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%>
+ <% 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 %>
+
+ <% 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%>
+ <% 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%>
+
+ <% 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-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb
deleted file mode 100644
index 84ce62cb141..00000000000
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :title do %>
- When does the leave year start?
-<% end %>
-
-<% render_content_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 %>
- 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 %>
- 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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..8ae470a08d6
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Calculate your statutory redundancy pay
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Calculate how much statutory redundancy you can get. It’s based on age, weekly pay and number of years in the job.
+
+ You only qualify for statutory redundancy pay if you’ve worked for your employer for at least 2 years.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.govspeak.erb
deleted file mode 100644
index 32e95005121..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Calculate your statutory redundancy pay
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Calculate how much statutory redundancy you can get. It’s based on age, weekly pay and number of years in the job.
-
- You only qualify for statutory redundancy pay if you’ve worked for your employer for at least 2 years.
-<% 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
new file mode 100644
index 00000000000..fd747f32693
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.erb
@@ -0,0 +1,28 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ ##How it’s worked out
+
+ Pay is capped at <%= format_money(rate) %> (<%= format_money(ni_rate) %> in Northern Ireland) per week. Length of service is capped at 20 years.
+
+ ^The maximum amount of statutory redundancy pay is <%= format_money(max_amount) %> (<%= format_money(ni_max_amount) %> in Northern Ireland)^
+
+ Years of service or earnings over these amounts aren’t included in the calculation.
+
+ You can’t get less than the statutory amount but you may get more if your employer has a redundancy scheme. Redundancy pay up to £30,000 is tax-free.
+
+ Your entitlement is <%= number_of_weeks_entitlement %> weeks.
+
+ You get:
+
+ + 0.5 week’s pay for each full year worked when you’re under 22
+ + 1 week’s pay for each full year worked when you’re between 22 and 41
+ + 1.5 week’s pay for each full year worked when you’re 41 or older
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Read the guide to Redundancy: your rights](https://www.gov.uk/redundant-your-rights)
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.govspeak.erb
deleted file mode 100644
index ea952d3d734..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- ##How it’s worked out
-
- Pay is capped at <%= format_money(rate) %> (<%= format_money(ni_rate) %> in Northern Ireland) per week. Length of service is capped at 20 years.
-
- ^The maximum amount of statutory redundancy pay is <%= format_money(max_amount) %> (<%= format_money(ni_max_amount) %> in Northern Ireland)^
-
- Years of service or earnings over these amounts aren’t included in the calculation.
-
- You can’t get less than the statutory amount but you may get more if your employer has a redundancy scheme. Redundancy pay up to £30,000 is tax-free.
-
- Your entitlement is <%= number_of_weeks_entitlement %> weeks.
-
- You get:
-
- + 0.5 week’s pay for each full year worked when you’re under 22
- + 1 week’s pay for each full year worked when you’re between 22 and 41
- + 1.5 week’s pay for each full year worked when you’re 41 or older
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Read the guide to Redundancy: your rights](https://www.gov.uk/redundant-your-rights)
-<% 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
new file mode 100644
index 00000000000..758bfc2f357
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Based on your answers, you’re not entitled to statutory redundancy pay.
+<% end %>
+
+<% govspeak_for :body do %>
+ You need to have worked for your employer continuously for at least 2 years before you can get statutory redundancy pay.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Read the guide to Redundancy: your rights](https://www.gov.uk/redundant-your-rights)
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.govspeak.erb
deleted file mode 100644
index 40028fc8d52..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Based on your answers, you’re not entitled to statutory redundancy pay.
-<% end %>
-
-<% render_content_for :body do %>
- You need to have worked for your employer continuously for at least 2 years before you can get statutory redundancy pay.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Read the guide to Redundancy: your rights](https://www.gov.uk/redundant-your-rights)
-<% 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
new file mode 100644
index 00000000000..ca7d2a3db71
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How old were you on the date you were made redundant?
+<% end %>
+
+<% 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/age_of_employee.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.govspeak.erb
deleted file mode 100644
index 7f3b34d6e4d..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How old were you on the date you were made redundant?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..7d7f0263818
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What date were you made redundant?
+<% end %>
+
+<% 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/date_of_redundancy.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.govspeak.erb
deleted file mode 100644
index 558b360a910..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What date were you made redundant?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..90ff8233875
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ What is your weekly pay before tax and any other deductions?
+<% end %>
+
+<% text_for :hint do %>
+ Examples of other deductions include student loans and child maintenance.
+<% end %>
+
+<% text_for :suffix_label do %>
+ per week
+<% end %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb
deleted file mode 100644
index e67caac409f..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- What is your weekly pay before tax and any other deductions?
-<% end %>
-
-<% render_content_for :hint do %>
- Examples of other deductions include student loans and child maintenance.
-<% end %>
-
-<% render_content_for :suffix_label do %>
- per week
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..159641cb92b
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many years have you worked for your employer?
+<% end %>
+
+<% text_for :hint do %>
+ Only count full years of service. For example, 3 years and 9 months count as 3 years.
+<% end %>
+
+<% 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-your-redundancy-pay/questions/years_employed.govspeak.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.govspeak.erb
deleted file mode 100644
index fd6e7c70435..00000000000
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many years have you worked for your employer?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..10ca6cfaa0c
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/check_uk_visa.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Check if you need a UK visa
+<% end %>
+
+<% text_for :meta_description do %>
+ You may need a visa to come to the UK to visit, study or work.
+<% end %>
+
+<% govspeak_for :body 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/check_uk_visa.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/check_uk_visa.govspeak.erb
deleted file mode 100644
index 6e280cd2708..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/check_uk_visa.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Check if you need a UK visa
-<% end %>
-
-<% render_content_for :meta_description do %>
- You may need a visa to come to the UK to visit, study or work.
-<% end %>
-
-<% render_content_for :body 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/_b1_b2_visa_exception.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/_b1_b2_visa_exception.erb
similarity index 100%
rename from lib/smart_answer_flows/check-uk-visa/outcomes/_b1_b2_visa_exception.govspeak.erb
rename to lib/smart_answer_flows/check-uk-visa/outcomes/_b1_b2_visa_exception.erb
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/_estonia_or_latvia.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/_estonia_or_latvia.erb
similarity index 100%
rename from lib/smart_answer_flows/check-uk-visa/outcomes/_estonia_or_latvia.govspeak.erb
rename to lib/smart_answer_flows/check-uk-visa/outcomes/_estonia_or_latvia.erb
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/_stateless_or_refugee.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/_stateless_or_refugee.erb
similarity index 100%
rename from lib/smart_answer_flows/check-uk-visa/outcomes/_stateless_or_refugee.govspeak.erb
rename to lib/smart_answer_flows/check-uk-visa/outcomes/_stateless_or_refugee.erb
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
new file mode 100644
index 00000000000..2232aee3ff5
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Diplomatic Business
+<% end %>
+
+<% govspeak_for :body do %>
+ You won’t need a visa to come to the UK for a posting or to transit through the UK if you’re going to or returning from a posting in another country. You can still apply for an [exempt vignette](/exempt-vignette).
+
+ Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
+
+ ##Government business
+
+ You won’t need a visa to come to the UK on official government business for your country if you're a serving government minister. You can still apply for an [exempt vignette](/exempt-vignette).
+
+ Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.govspeak.erb
deleted file mode 100644
index af4eb4d29b1..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Diplomatic Business
-<% end %>
-
-<% render_content_for :body do %>
- You won’t need a visa to come to the UK for a posting or to transit through the UK if you’re going to or returning from a posting in another country. You can still apply for an [exempt vignette](/exempt-vignette).
-
- Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
-
- ##Government business
-
- You won’t need a visa to come to the UK on official government business for your country if you're a serving government minister. You can still apply for an [exempt vignette](/exempt-vignette).
-
- Your partner or family members [may need a visa to join you](/government/collections/visa-application-forms-diplomats-and-official-visits).
-<% 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
new file mode 100644
index 00000000000..4d49fdc1498
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ You may need a visa to join a member of your family or partner for a long stay
+<% end %>
+
+<% govspeak_for :body do %>
+ ^You **won’t need a visa** if you’re visiting for a short period (up to 6 months) and you won’t work or study.^
+
+ The visa you apply for depends on your family member or partner’s situation.
+
+ ##They’re settled in the UK
+
+ Apply for a [‘family of a settled person’ visa](/join-family-in-uk) if your family member or partner is either a British citizen or from outside the European Economic Area (EEA) and settled in the UK.
+
+ ##They’re working or studying in the UK
+
+ You may be able to apply as a ‘dependant’ of [your family member or partner's visa category](/visas-immigration) if they're from outside the EEA and they're working or studying in the UK.
+
+ ##They’re from the EEA
+
+ Apply for a [family permit](/family-permit) to join your family or partner in the UK.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.govspeak.erb
deleted file mode 100644
index dddbf28d802..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- You may need a visa to join a member of your family or partner for a long stay
-<% end %>
-
-<% render_content_for :body do %>
- ^You **won’t need a visa** if you’re visiting for a short period (up to 6 months) and you won’t work or study.^
-
- The visa you apply for depends on your family member or partner’s situation.
-
- ##They’re settled in the UK
-
- Apply for a [‘family of a settled person’ visa](/join-family-in-uk) if your family member or partner is either a British citizen or from outside the European Economic Area (EEA) and settled in the UK.
-
- ##They’re working or studying in the UK
-
- You may be able to apply as a ‘dependant’ of [your family member or partner's visa category](/visas-immigration) if they're from outside the EEA and they're working or studying in the UK.
-
- ##They’re from the EEA
-
- Apply for a [family permit](/family-permit) to join your family or partner in the UK.
-<% 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
new file mode 100644
index 00000000000..9ea6d9e468b
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ You’ll need a visa to join your family or partner in the UK for a long stay
+<% end %>
+
+<% govspeak_for :body do %>
+ ^You don’t need a visa if you’re visiting family or a partner for 6 months or less.^
+
+ The visa you apply for depends on your family member’s situation.
+
+ ##They’re settled in the UK
+
+ Apply for a [‘family of a settled person’ visa](/join-family-in-uk) if your family member or partner is a British citizen or they’re from outside the European Economic Area (EEA) and settled in the UK.
+
+ ##They’re working or studying in the UK
+
+ You may be able to apply as a ‘dependant’ of [your family member's visa category](/visas-immigration) if they're from outside the EEA and they're working or studying in the UK.
+
+ ##They’re from the EEA
+
+ Apply for a [family permit](/family-permit) to join your family or partner for a short or long stay if they’re living in the UK.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.govspeak.erb
deleted file mode 100644
index 61612f1ed4a..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to join your family or partner in the UK for a long stay
-<% end %>
-
-<% render_content_for :body do %>
- ^You don’t need a visa if you’re visiting family or a partner for 6 months or less.^
-
- The visa you apply for depends on your family member’s situation.
-
- ##They’re settled in the UK
-
- Apply for a [‘family of a settled person’ visa](/join-family-in-uk) if your family member or partner is a British citizen or they’re from outside the European Economic Area (EEA) and settled in the UK.
-
- ##They’re working or studying in the UK
-
- You may be able to apply as a ‘dependant’ of [your family member's visa category](/visas-immigration) if they're from outside the EEA and they're working or studying in the UK.
-
- ##They’re from the EEA
-
- Apply for a [family permit](/family-permit) to join your family or partner for a short or long stay if they’re living in the UK.
-<% 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
new file mode 100644
index 00000000000..2957751511d
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
+
+ If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
+
+ - a British citizen
+ - settled in the UK
+ - someone with humanitarian protection, for example if they have refugee status
+
+ ^If you want to convert a civil partnership into a marriage, you'll need to apply for an [electronic visa waiver (EVW)](/get-electronic-visa-waiver) or a [Standard Visitor visa](/standard-visitor-visa).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.govspeak.erb
deleted file mode 100644
index 399b6863210..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
-
- If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
-
- - a British citizen
- - settled in the UK
- - someone with humanitarian protection, for example if they have refugee status
-
- ^If you want to convert a civil partnership into a marriage, you'll need to apply for an [electronic visa waiver (EVW)](/get-electronic-visa-waiver) or a [Standard Visitor visa](/standard-visitor-visa).
-<% 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
new file mode 100644
index 00000000000..42a65ebc164
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
+
+ If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
+
+ - a British citizen
+ - settled in the UK
+ - someone with humanitarian protection, for example if they have refugee status
+
+ ###If you want to convert a civil partnership into a marriage
+
+ You won’t need a visa. However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a Standard Visitor visa, to show officers at the UK border.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.govspeak.erb
deleted file mode 100644
index e7357502fce..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
-
- If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
-
- - a British citizen
- - settled in the UK
- - someone with humanitarian protection, for example if they have refugee status
-
- ###If you want to convert a civil partnership into a marriage
-
- You won’t need a visa. However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a Standard Visitor visa, to show officers at the UK border.
-<% 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
new file mode 100644
index 00000000000..b903935b805
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
+
+ If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
+
+ - a British citizen
+ - settled in the UK
+ - someone with humanitarian protection, for example if they have refugee status
+
+ ###If you want to convert a civil partnership into a marriage
+
+ You won’t need a visa if your passport has a personal ID number on the biodata page.
+
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a Standard Visitor visa, to show officers at the UK border.
+
+ ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a Standard Visitor visa](/standard-visitor-visa).^
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.govspeak.erb
deleted file mode 100644
index 82841833748..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
-
- If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
-
- - a British citizen
- - settled in the UK
- - someone with humanitarian protection, for example if they have refugee status
-
- ###If you want to convert a civil partnership into a marriage
-
- You won’t need a visa if your passport has a personal ID number on the biodata page.
-
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a Standard Visitor visa, to show officers at the UK border.
-
- ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a Standard Visitor visa](/standard-visitor-visa).^
-<% 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
new file mode 100644
index 00000000000..3ae7e249938
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>
+
+ Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
+
+ If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
+
+ - a British citizen
+ - settled in the UK
+ - someone with humanitarian protection, for example if they have refugee status
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.govspeak.erb
deleted file mode 100644
index 787bb10befa..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- <%= render partial: 'estonia_or_latvia.govspeak.erb', locals: {calculator: calculator} %>
-
- Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.
-
- If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:
-
- - a British citizen
- - settled in the UK
- - someone with humanitarian protection, for example if they have refugee status
-<% 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
new file mode 100644
index 00000000000..7598e9e18d0
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You won’t need a visa to visit the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ You can stay in the UK for up to 6 months without a visa.
+
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a [Standard Visitor visa](/standard-visitor-visa), to show to officers at the UK border.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.govspeak.erb
deleted file mode 100644
index c1aeea03c71..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You won’t need a visa to visit the UK
-<% end %>
-
-<% render_content_for :body do %>
- You can stay in the UK for up to 6 months without a visa.
-
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a [Standard Visitor visa](/standard-visitor-visa), to show to officers at the UK border.
-<% 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
new file mode 100644
index 00000000000..bc54098778e
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ You’ll need a visa to visit the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ You should apply for a [Standard Visitor visa](/standard-visitor-visa).
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.govspeak.erb
deleted file mode 100644
index dac7af57b9f..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to visit the UK
-<% end %>
-
-<% render_content_for :body do %>
- You should apply for a [Standard Visitor visa](/standard-visitor-visa).
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- <%= render partial: 'estonia_or_latvia.govspeak.erb', locals: {calculator: calculator} %>
-<% 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
new file mode 100644
index 00000000000..66de06ac8a1
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.erb
@@ -0,0 +1,46 @@
+<% text_for :title do %>
+ You do not need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+
+ <% if calculator.study_visit? %>
+ <% if calculator.passport_country_in_epassport_gate_list? %>
+ You must go to a border control officer when you arrive in the UK to get a stamp in your passport. This will allow you to study in the UK.
+
+ ^You cannot get a stamp if you use the ePassport gates.
+ <% end %>
+
+ You should bring documents with you that show you:
+
+ - have been accepted on a course by an [accredited institution](/study-visit-visa/eligibility) or by a UK Higher Education Institution, for example, a letter of acceptance from the institution
+ - are able to fund your stay in the UK and return journey
+ - intend to leave the UK at the end of your course
+
+ You’ll also need to show:
+
+ - details of where you intend to stay
+ - contact details for at least one parent or guardian in your home country (if you’re under 18 years old)
+
+ If you're under 18 and travelling without your parent or guardian, you'll need to provide [extra information to show they’ve given you permission](/study-visit-visa/documents-you-must-provide).
+
+ ^ You must always have these documents with you if you’re travelling in and out of the UK during your stay. ^
+
+ <% elsif calculator.travelling_to_elsewhere? %>
+ <% if calculator.passport_country_in_non_visa_national_list? ||
+ calculator.passport_country_in_ukot_list? %>
+
+ However, you should bring evidence of your onward journey to show to officers at the UK border.
+ <% end %>
+
+ <% elsif calculator.travelling_to_ireland? %>
+ <% if calculator.passport_country_in_non_visa_national_list? ||
+ calculator.passport_country_in_ukot_list? %>
+
+ However, you should bring the evidence of your onward journey to show to officers at the UK border.
+
+ %You may want to [apply for a visa](/browse/visas-immigration/tourist-short-stay-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
+
+ <% end %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.govspeak.erb
deleted file mode 100644
index a0593eb89fb..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-<% render_content_for :title do %>
- You do not need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
-
- <% if calculator.study_visit? %>
- <% if calculator.passport_country_in_epassport_gate_list? %>
- You must go to a border control officer when you arrive in the UK to get a stamp in your passport. This will allow you to study in the UK.
-
- ^You cannot get a stamp if you use the ePassport gates.
- <% end %>
-
- You should bring documents with you that show you:
-
- - have been accepted on a course by an [accredited institution](/study-visit-visa/eligibility) or by a UK Higher Education Institution, for example, a letter of acceptance from the institution
- - are able to fund your stay in the UK and return journey
- - intend to leave the UK at the end of your course
-
- You’ll also need to show:
-
- - details of where you intend to stay
- - contact details for at least one parent or guardian in your home country (if you’re under 18 years old)
-
- If you're under 18 and travelling without your parent or guardian, you'll need to provide [extra information to show they’ve given you permission](/study-visit-visa/documents-you-must-provide).
-
- ^ You must always have these documents with you if you’re travelling in and out of the UK during your stay. ^
-
- <% elsif calculator.travelling_to_elsewhere? %>
- <% if calculator.passport_country_in_non_visa_national_list? ||
- calculator.passport_country_in_ukot_list? %>
-
- However, you should bring evidence of your onward journey to show to officers at the UK border.
- <% end %>
-
- <% elsif calculator.travelling_to_ireland? %>
- <% if calculator.passport_country_in_non_visa_national_list? ||
- calculator.passport_country_in_ukot_list? %>
-
- However, you should bring the evidence of your onward journey to show to officers at the UK border.
-
- %You may want to [apply for a visa](/browse/visas-immigration/tourist-short-stay-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
-
- <% end %>
- <% end %>
-<% 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
new file mode 100644
index 00000000000..94a0f0687de
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ You’ll need a visa to join your family or partner in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [‘family of a settled person’ visa](/join-family-in-uk).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.govspeak.erb
deleted file mode 100644
index 32a26d74d81..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to join your family or partner in the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [‘family of a settled person’ visa](/join-family-in-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
new file mode 100644
index 00000000000..18f8e038cf0
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ You’ll need a visa to join your family or partner in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ The visa you need depends on your partner or family member’s situation.
+
+ ## They’re working or studying in the UK
+
+ You may be able to apply as a ‘dependant’ of
+ [your family member’s visa category](/visas-immigration).
+
+ ## They’re not working or studying in the UK
+
+ You can apply for a [Standard Visitor visa](/standard-visitor-visa). Your
+ visit must be for 6 months or less.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.govspeak.erb
deleted file mode 100644
index 73ff5484ec4..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to join your family or partner in the UK
-<% end %>
-
-<% render_content_for :body do %>
- The visa you need depends on your partner or family member’s situation.
-
- ## They’re working or studying in the UK
-
- You may be able to apply as a ‘dependant’ of
- [your family member’s visa category](/visas-immigration).
-
- ## They’re not working or studying in the UK
-
- You can apply for a [Standard Visitor visa](/standard-visitor-visa). Your
- visit must be for 6 months or less.
-<% 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
new file mode 100644
index 00000000000..d8dd83a1bfa
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ You’ll need a visa to join your family or partner in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [family permit](/family-permit).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.govspeak.erb
deleted file mode 100644
index c3cd2245069..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to join your family or partner in the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [family permit](/family-permit).
-<% 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
new file mode 100644
index 00000000000..4749a002d9c
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ You won’t need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ You can stay in the UK for up to 6 months without a visa.
+
+ However, you should bring the [same documents](https://www.gov.uk/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
+
+ %You may want to [apply for a visa](/browse/visas-immigration/short-visit-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.govspeak.erb
deleted file mode 100644
index 0fac63ad97e..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- You won’t need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- You can stay in the UK for up to 6 months without a visa.
-
- However, you should bring the [same documents](https://www.gov.uk/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
-
- %You may want to [apply for a visa](/browse/visas-immigration/short-visit-visas) if you have a criminal record or you’ve previously been refused entry into 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
new file mode 100644
index 00000000000..a2bdc07ad0c
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ You’ll need an electronic visa waiver (EVW) or a visa
+<% end %>
+
+<% govspeak_for :body do %>
+ You must either apply for:
+
+ + an [EVW](/get-electronic-visa-waiver) to stay for up to 6 months
+ + a [Parent of Tier 4 child visa](/parent-of-a-child-at-school-visa)
+
+ *[EVW]: electronic visa waiver
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.govspeak.erb
deleted file mode 100644
index 546d8386e5c..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- You’ll need an electronic visa waiver (EVW) or a visa
-<% end %>
-
-<% render_content_for :body do %>
- You must either apply for:
-
- + an [EVW](/get-electronic-visa-waiver) to stay for up to 6 months
- + a [Parent of Tier 4 child visa](/parent-of-a-child-at-school-visa)
-
- *[EVW]: electronic visa waiver
-<% 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
new file mode 100644
index 00000000000..f9b7ae0cdd8
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ You’ll need a visa to stay with your child
+<% end %>
+
+<% govspeak_for :body do %>
+ You can apply for a [parent of a Tier 4 child visa](/parent-of-a-child-at-school-visa) if your child is under 12.
+
+ <% if calculator.passport_country_is_estonia? || calculator.passport_country_is_latvia? %>
+ You must apply for your visa from the country you’re currently living in.
+ <% end %>
+
+ If they’re 12 or over, you can [apply for a visa to visit them](/standard-visitor-visa) for up to 6 months.
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.govspeak.erb
deleted file mode 100644
index 02249189069..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to stay with your child
-<% end %>
-
-<% render_content_for :body do %>
- You can apply for a [parent of a Tier 4 child visa](/parent-of-a-child-at-school-visa) if your child is under 12.
-
- <% if calculator.passport_country_is_estonia? || calculator.passport_country_is_latvia? %>
- You must apply for your visa from the country you’re currently living in.
- <% end %>
-
- If they’re 12 or over, you can [apply for a visa to visit them](/standard-visitor-visa) for up to 6 months.
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-<% 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
new file mode 100644
index 00000000000..5571f6102bc
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ Apply for a [Standard Visitor visa](/standard-visitor-visa).
+
+ <% if calculator.passport_country_is_china? %>
+ ##You're travelling in a tour group
+
+ You can apply for an [‘ADS visa’](/ads-visa) if you’re planning to travel to the UK as part of a tour group for less than 30 days.
+ <% end %>
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.govspeak.erb
deleted file mode 100644
index 9fb5f44c62e..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- Apply for a [Standard Visitor visa](/standard-visitor-visa).
-
- <% if calculator.passport_country_is_china? %>
- ##You're travelling in a tour group
-
- You can apply for an [‘ADS visa’](/ads-visa) if you’re planning to travel to the UK as part of a tour group for less than 30 days.
- <% end %>
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-<% 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
new file mode 100644
index 00000000000..ed234b6cd01
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ You’ll need a visa to study in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ Apply for a [Short-term study visa](/study-visit-visa) if you are studying for 6 months or less.
+
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.govspeak.erb
deleted file mode 100644
index 7e6e4d7c9a3..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to study in the UK
-<% end %>
-
-<% render_content_for :body do %>
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- Apply for a [Short-term study visa](/study-visit-visa) if you are studying for 6 months or less.
-
-<% 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
new file mode 100644
index 00000000000..f8e5fbec27d
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ You’ll need an electronic visa waiver (EVW) or a visa
+<% end %>
+
+<% govspeak_for :body do %>
+ You must either apply for:
+
+ + an [EVW](/get-electronic-visa-waiver)
+ + a [Short-term study visa](/study-visit-visa)
+
+ *[EVW]: electronic visa waiver
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.govspeak.erb
deleted file mode 100644
index 471d760a94b..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- You’ll need an electronic visa waiver (EVW) or a visa
-<% end %>
-
-<% render_content_for :body do %>
- You must either apply for:
-
- + an [EVW](/get-electronic-visa-waiver)
- + a [Short-term study visa](/study-visit-visa)
-
- *[EVW]: electronic visa waiver
-<% 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
new file mode 100644
index 00000000000..583d8118712
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You won't need a visa if your passport has a personal ID number on the bio data page.
+<% end %>
+
+<% govspeak_for :body do %>
+ However, you should bring the [same documents](/study-visit-visa/documents-you-must-provide) you'd need to apply for a visa, to show to officers at the UK border.
+
+ ^If the bio data page in your passport doesn't include a personal ID number, you must [apply for a short-term study visa](/study-visit-visa).^
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.govspeak.erb
deleted file mode 100644
index 0c6004715ab..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You won't need a visa if your passport has a personal ID number on the bio data page.
-<% end %>
-
-<% render_content_for :body do %>
- However, you should bring the [same documents](/study-visit-visa/documents-you-must-provide) you'd need to apply for a visa, to show to officers at the UK border.
-
- ^If the bio data page in your passport doesn't include a personal ID number, you must [apply for a short-term study visa](/study-visit-visa).^
-<% 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
new file mode 100644
index 00000000000..f844fc81333
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ You’ll need a visa to study in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ The visa you apply for depends on your circumstances.
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ Apply for a [study visa](/tier-4-general-visa) if you’re coming to the UK to study a university or college course for more than 6 months, or more than 11 months if it’s an English language course.
+
+ You can apply for a [Short-term Study visa](/study-visit-visa) if you’re 16 or over and studying an English language course for 11 months or less.
+
+ You can also apply for a [child study visa](/child-study-visa) if you’re under 18.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.govspeak.erb
deleted file mode 100644
index d537843ae87..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to study in the UK
-<% end %>
-
-<% render_content_for :body do %>
- The visa you apply for depends on your circumstances.
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- Apply for a [study visa](/tier-4-general-visa) if you’re coming to the UK to study a university or college course for more than 6 months, or more than 11 months if it’s an English language course.
-
- You can apply for a [Short-term Study visa](/study-visit-visa) if you’re 16 or over and studying an English language course for 11 months or less.
-
- You can also apply for a [child study visa](/child-study-visa) if you’re under 18.
-<% 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
new file mode 100644
index 00000000000..bde35cf46a0
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.erb
@@ -0,0 +1,21 @@
+<% text_for :title do %>
+ You’ll need a visa to come to the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ The visa you need depends on your partner or family member’s situation.
+
+ ## They’re a British citizen
+
+ In most cases, you should apply for a [Standard Visitor visa](/standard-visitor-visa).
+
+ You should [apply for a ‘Surinder Singh’ EEA family permit](/family-permit/surinder-singh) instead if you’ve been living with them in an EEA country other than the UK and they’ve been working, self-employed, self-sufficient or studying there.
+
+ ## They’re from elsewhere in the EEA
+
+ Apply for a [family permit](/family-permit).
+
+ ## They’re from outside the EEA
+
+ Apply for a [Standard Visitor visa](/standard-visitor-visa).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.govspeak.erb
deleted file mode 100644
index 764aca475c3..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to come to the UK
-<% end %>
-
-<% render_content_for :body do %>
- The visa you need depends on your partner or family member’s situation.
-
- ## They’re a British citizen
-
- In most cases, you should apply for a [Standard Visitor visa](/standard-visitor-visa).
-
- You should [apply for a ‘Surinder Singh’ EEA family permit](/family-permit/surinder-singh) instead if you’ve been living with them in an EEA country other than the UK and they’ve been working, self-employed, self-sufficient or studying there.
-
- ## They’re from elsewhere in the EEA
-
- Apply for a [family permit](/family-permit).
-
- ## They’re from outside the EEA
-
- Apply for a [Standard Visitor visa](/standard-visitor-visa).
-<% 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
new file mode 100644
index 00000000000..b46236a3318
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.erb
@@ -0,0 +1,3 @@
+<% 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_datv_exception.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.govspeak.erb
deleted file mode 100644
index 61b4fabb860..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..b4591cc73ba
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.erb
@@ -0,0 +1,53 @@
+<% 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 %>
+ You’ll need a visa to pass through the UK in transit
+ <% end %>
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if calculator.passport_country_in_electronic_visa_waiver_list? %>
+ You must either apply for:
+
+ - an [EVW](/get-electronic-visa-waiver)
+ - a [Visitor in Transit visa](/transit-visa)
+ <% else %>
+ You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
+ <% end %>
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ ##Transiting without a visa
+ You might be eligible for ‘transit without visa’ if:
+
+ - you arrive and depart by air
+ - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
+ - have the correct documents for your destination (eg a visa for that country)
+
+ You must also:
+
+ - be travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+ - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+ - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
+ - have a residence permit issued by Australia or New Zealand
+ - have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - have a residence permit issued by Canada issued after 28 June 2002
+ - have a uniform format category D visa for entry to a country in the EEA or Switzerland
+ - have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
+ - have a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
+
+ E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
+
+ All visas and residence permits must be valid.
+
+ Australian paper confirmation slips are not accepted.
+
+ ^Transiting without a visa is decided by the immigration officer at the border. You won’t be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.^
+
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.govspeak.erb
deleted file mode 100644
index d2b69800aee..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<% render_content_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 %>
- You’ll need a visa to pass through the UK in transit
- <% end %>
-<% end %>
-
-<% render_content_for :body do %>
- <% if calculator.passport_country_in_electronic_visa_waiver_list? %>
- You must either apply for:
-
- - an [EVW](/get-electronic-visa-waiver)
- - a [Visitor in Transit visa](/transit-visa)
- <% else %>
- You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
- <% end %>
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- ##Transiting without a visa
- You might be eligible for ‘transit without visa’ if:
-
- - you arrive and depart by air
- - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
- - have the correct documents for your destination (eg a visa for that country)
-
- You must also:
-
- - be travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
- - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
- - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
- - have a residence permit issued by Australia or New Zealand
- - have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - have a residence permit issued by Canada issued after 28 June 2002
- - have a uniform format category D visa for entry to a country in the EEA or Switzerland
- - have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
- - have a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
-
- E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
-
- All visas and residence permits must be valid.
-
- Australian paper confirmation slips are not accepted.
-
- ^Transiting without a visa is decided by the immigration officer at the border. You won’t be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.^
-
-<% end %>
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
new file mode 100644
index 00000000000..633870a8fb9
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.erb
@@ -0,0 +1,41 @@
+<% text_for :title do %>
+ You’ll need a visa to pass through the UK in transit
+<% end %>
+
+<% govspeak_for :body do %>
+ You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
+
+^ You don’t need to apply for a Visitor in Transit visa if you already have a Marriage Visitor or Standard Visitor visa. ^
+
+ ##Transiting without a visa
+
+ You might be eligible for ‘transit without visa’ if:
+
+ - you arrive and depart by air
+ - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
+ - have the right documents for your destination (eg a visa for that country)
+
+ One of the following must also apply:
+
+ - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you have a residence permit issued by Australia or New Zealand
+ - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - you have a residence permit issued by Canada issued after 28 June 2002
+ - you have a uniform format category D visa for entry to a country in the EEA or Switzerland
+ - you have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
+ - you’re travelling from the Republic of Ireland and it’s less than 3 months since you were last given permission, on the basis of holding a valid Irish biometric visa, to land or be in Ireland
+ - you have a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - you have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - you have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - you have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
+
+ %E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.%
+
+ All visas and residence permits must be valid.
+
+ Australian paper confirmation slips are not accepted.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.govspeak.erb
deleted file mode 100644
index 170187a5599..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to pass through the UK in transit
-<% end %>
-
-<% render_content_for :body do %>
- You should apply for a [Visitor in Transit visa](/transit-visa) if you arrive on a flight and will pass through immigration control before you leave the UK.
-
-^ You don’t need to apply for a Visitor in Transit visa if you already have a Marriage Visitor or Standard Visitor visa. ^
-
- ##Transiting without a visa
-
- You might be eligible for ‘transit without visa’ if:
-
- - you arrive and depart by air
- - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
- - have the right documents for your destination (eg a visa for that country)
-
- One of the following must also apply:
-
- - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you have a residence permit issued by Australia or New Zealand
- - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - you have a residence permit issued by Canada issued after 28 June 2002
- - you have a uniform format category D visa for entry to a country in the EEA or Switzerland
- - you have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
- - you’re travelling from the Republic of Ireland and it’s less than 3 months since you were last given permission, on the basis of holding a valid Irish biometric visa, to land or be in Ireland
- - you have a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - you have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - you have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - you have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
-
- %E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.%
-
- All visas and residence permits must be valid.
-
- Australian paper confirmation slips are not accepted.
-<% 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
new file mode 100644
index 00000000000..c91a6166113
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.erb
@@ -0,0 +1,28 @@
+<% text_for :title do %>
+ You’ll need a visa to pass through the UK in transit (unless you’re exempt)
+<% end %>
+
+<% govspeak_for :body do %>
+ You should apply for a [Direct Airside Transit visa](/transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control.
+
+ ##Exemptions
+
+ You don’t need a visa if you have one of the following:
+
+ - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - a residence permit issued by Australia or New Zealand
+ - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - a resident permit issued by Canada after 28 June 2002
+ - a uniform format category D visa for entry into a country in the European Economic Area (EEA) or Switzerland
+ - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section)
+ - a Schengen Approved Destination Scheme (ADS) group tourism visa where the holder is travelling to the Schengen country that issued the visa
+ - a flight ticket from the Schengen area, if you can prove that you entered the Schengen area in the previous 30 days on the basis of a valid Schengen ADS visa
+ - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ All visas and residence permits must be valid.
+
+ %E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.%
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.govspeak.erb
deleted file mode 100644
index 3cf727a37d4..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to pass through the UK in transit (unless you’re exempt)
-<% end %>
-
-<% render_content_for :body do %>
- You should apply for a [Direct Airside Transit visa](/transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control.
-
- ##Exemptions
-
- You don’t need a visa if you have one of the following:
-
- - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - a residence permit issued by Australia or New Zealand
- - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - a resident permit issued by Canada after 28 June 2002
- - a uniform format category D visa for entry into a country in the European Economic Area (EEA) or Switzerland
- - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section)
- - a Schengen Approved Destination Scheme (ADS) group tourism visa where the holder is travelling to the Schengen country that issued the visa
- - a flight ticket from the Schengen area, if you can prove that you entered the Schengen area in the previous 30 days on the basis of a valid Schengen ADS visa
- - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- All visas and residence permits must be valid.
-
- %E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.%
-<% 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
new file mode 100644
index 00000000000..65cc7f38406
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.erb
@@ -0,0 +1,67 @@
+<% text_for :title do %>
+ You may need a Direct Airside Transit Visa
+<% end %>
+
+<% govspeak_for :body do %>
+ You’ll need a [Direct Airside Transit visa](/transit-visa/direct-airside-transit-visa) if you’re a refugee and originally from one of these countries:
+
+ * Afghanistan
+ * Albania
+ * Algeria
+ * Angola
+ * Bangladesh
+ * Belarus
+ * Burundi
+ * Cameroon
+ * China - unless you have a diplomatic passport or you’re travelling with a Chinese government minister on an Official Visit to the UK and you have a service or public affairs passport
+ * Congo
+ * Democratic Republic of Congo or former Republic of Zaire
+ * Cyprus
+ * Egypt
+ * Eritrea
+ * Ethiopia
+ * The Gambia
+ * Ghana
+ * Guinea
+ * Guinea-Bissau
+ * India - unless you have a diplomatic or official passport
+ * Iran
+ * Iraq
+ * Ivory Coast
+ * Jamaica
+ * Kenya
+ * Kosovo
+ * Lebanon
+ * Lesotho
+ * Liberia
+ * Libya
+ * North Macedonia
+ * Malawi
+ * Moldova
+ * Mongolia
+ * Myanmar
+ * Nepal
+ * Nigeria
+ * Pakistan
+ * Palestinian Territories
+ * Rwanda
+ * Senegal
+ * Serbia
+ * Sierra Leone
+ * Somalia
+ * South Africa
+ * South Sudan
+ * Sri Lanka
+ * Sudan
+ * Eswatini
+ * Syria
+ * Tanzania
+ * Turkey - unless you have a diplomatic passport
+ * Uganda
+ * Venezuela - unless you have a biometric passport
+ * Vietnam - unless you have a diplomatic passport
+ * Yemen
+ * Zimbabwe
+
+ Otherwise you don't need a visa.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.govspeak.erb
deleted file mode 100644
index dd813c4b412..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.govspeak.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-<% render_content_for :title do %>
- You may need a Direct Airside Transit Visa
-<% end %>
-
-<% render_content_for :body do %>
- You’ll need a [Direct Airside Transit visa](/transit-visa/direct-airside-transit-visa) if you’re a refugee and originally from one of these countries:
-
- * Afghanistan
- * Albania
- * Algeria
- * Angola
- * Bangladesh
- * Belarus
- * Burundi
- * Cameroon
- * China - unless you have a diplomatic passport or you’re travelling with a Chinese government minister on an Official Visit to the UK and you have a service or public affairs passport
- * Congo
- * Democratic Republic of Congo or former Republic of Zaire
- * Cyprus
- * Egypt
- * Eritrea
- * Ethiopia
- * The Gambia
- * Ghana
- * Guinea
- * Guinea-Bissau
- * India - unless you have a diplomatic or official passport
- * Iran
- * Iraq
- * Ivory Coast
- * Jamaica
- * Kenya
- * Kosovo
- * Lebanon
- * Lesotho
- * Liberia
- * Libya
- * North Macedonia
- * Malawi
- * Moldova
- * Mongolia
- * Myanmar
- * Nepal
- * Nigeria
- * Pakistan
- * Palestinian Territories
- * Rwanda
- * Senegal
- * Serbia
- * Sierra Leone
- * Somalia
- * South Africa
- * South Sudan
- * Sri Lanka
- * Sudan
- * Eswatini
- * Syria
- * Tanzania
- * Turkey - unless you have a diplomatic passport
- * Uganda
- * Venezuela - unless you have a biometric passport
- * Vietnam - unless you have a diplomatic passport
- * Yemen
- * Zimbabwe
-
- Otherwise you don't need a 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
new file mode 100644
index 00000000000..b9450cf69a7
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You won’t need a visa if your passport has a personal ID number on the bio data page.
+<% end %>
+
+<% govspeak_for :body do %>
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
+
+ ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a transit visa](/transit-visa).^
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.govspeak.erb
deleted file mode 100644
index f77e7b3f53f..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You won’t need a visa if your passport has a personal ID number on the bio data page.
-<% end %>
-
-<% render_content_for :body do %>
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
-
- ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a transit visa](/transit-visa).^
-<% 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
new file mode 100644
index 00000000000..08aec6ffec4
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.erb
@@ -0,0 +1,45 @@
+<% text_for :title do %>
+ You won't need a visa if your passport has a personal ID number on the bio data page.
+<% end %>
+
+<% govspeak_for :body do %>
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
+
+ ^ If the bio data page in your passport doesn't include a personal ID number, you should apply for a [Visitor in Transit](/transit-visa) visa.
+
+ ## Transiting without a visa
+
+ Even if you don’t have a personal ID number, you might be eligible to transit without visa if:
+
+ - you arrive and depart by air
+
+ - have a confirmed onward flight which leaves within 24 hours
+
+ - have the correct documents for your destination (eg a visa for that country)
+
+ One of the following must also apply:
+
+ - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+ - you have a residence permit issued by Australia or New Zealand
+ - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - you have a residence permit issued by Canada issued after 28 June 2002
+ - you have a uniform format category D visa for entry to a country in the EEA or Switzerland
+ - you have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
+ - you’re travelling from the Republic of Ireland and it’s less than 3 months since you were last given permission, on the basis of holding a valid Irish biometric visa, to land or be in Ireland
+ - you have a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - you have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - you have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - you have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can apply for a transit visa (/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
+
+ E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
+
+ All visas and residence permits must be valid.
+
+ Australian paper confirmation slips are not accepted.
+
+ ^ Transiting without a visa is decided by the immigration officer at the border. You won't be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.govspeak.erb
deleted file mode 100644
index 5eccc34bd07..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<% render_content_for :title do %>
- You won't need a visa if your passport has a personal ID number on the bio data page.
-<% end %>
-
-<% render_content_for :body do %>
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
-
- ^ If the bio data page in your passport doesn't include a personal ID number, you should apply for a [Visitor in Transit](/transit-visa) visa.
-
- ## Transiting without a visa
-
- Even if you don’t have a personal ID number, you might be eligible to transit without visa if:
-
- - you arrive and depart by air
-
- - have a confirmed onward flight which leaves within 24 hours
-
- - have the correct documents for your destination (eg a visa for that country)
-
- One of the following must also apply:
-
- - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa <%= render partial: 'b1_b2_visa_exception.govspeak.erb', locals: {calculator: calculator} %>
- - you have a residence permit issued by Australia or New Zealand
- - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - you have a residence permit issued by Canada issued after 28 June 2002
- - you have a uniform format category D visa for entry to a country in the EEA or Switzerland
- - you have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
- - you’re travelling from the Republic of Ireland and it’s less than 3 months since you were last given permission, on the basis of holding a valid Irish biometric visa, to land or be in Ireland
- - you have a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - you have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - you have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - you have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can apply for a transit visa (/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
-
- E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
-
- All visas and residence permits must be valid.
-
- Australian paper confirmation slips are not accepted.
-
- ^ Transiting without a visa is decided by the immigration officer at the border. You won't be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.
-<% 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
new file mode 100644
index 00000000000..c95da8f25e8
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.erb
@@ -0,0 +1,116 @@
+<% 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? %>
+ You’ll need an electronic visa waiver (EVW) or a visitor visa
+ <% else %>
+ You’ll need a visa to pass through the UK (unless you’re exempt)
+ <% end %>
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if calculator.passport_country_is_taiwan? %>
+
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
+
+ If your passport doesn’t have a personal ID number on the bio data page you’ll usually need to apply for a UK [standard visitor visa](/standard-visitor-visa).
+ <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
+
+ You must either apply for:
+
+ - an [EVW](/get-electronic-visa-waiver)
+ - a [Standard Visitor visa](/standard-visitor-visa)
+ <% else %>
+
+ You’ll usually need to apply for a UK [standard visitor visa](/standard-visitor-visa).
+ <% end %>
+
+ <% if calculator.passport_country_in_datv_list? ||
+ calculator.passport_country_is_taiwan? ||
+ calculator.passport_country_in_electronic_visa_waiver_list? ||
+ calculator.passport_country_in_visa_national_list? %>
+
+ ##Transiting without a visa
+
+ You might be eligible for ‘transit without visa’ if:
+
+ - you arrive and depart by air
+
+ - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
+
+ - have the right documents for your destination (for example a visa for that country)
+ <% if calculator.passport_country_in_visa_national_list? ||
+ calculator.passport_country_is_taiwan? ||
+ calculator.passport_country_in_datv_list? ||
+ passport_country_in_electronic_visa_waiver_list? %>
+
+ You must also have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland.
+
+ E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
+
+ All visas and residence permits must be valid.
+
+ You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules.
+
+ <% else %>
+
+ You must also:
+
+ - be travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+
+ - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+
+ - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
+
+ - have a residence permit issued by Australia or New Zealand
+
+ - have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+
+ - have a residence permit issued by Canada issued after 28 June 2002
+
+ - have a uniform format category D visa for entry to a country in the EEA or Switzerland
+
+ - have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
+
+ - have a valid USA permanent residence card issued by the USA on or after 21 April 1998
+
+ - have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+
+ - have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+
+ - have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
+
+ E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
+
+ All visas and residence permits must be valid.
+
+ Australian paper confirmation slips are not accepted.
+
+ ^Transiting without a visa is decided by the immigration officer at the border. You won’t be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.^
+
+ <% end %>
+ <% else %>
+
+ You don’t need a visa if:
+
+ - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
+ - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
+
+ You also won’t need a visa if you have any of the following:
+
+ - a residence permit issued by Australia or New Zealand
+ - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - a residence permit issued by Canada issued after 28 June 2002
+ - a uniform format category D visa for entry to a country in the EEA or Switzerland
+ - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
+ - a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+ - a Taiwanese passport with a personal ID number on the bio data page
+ <% end %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.govspeak.erb
deleted file mode 100644
index 11231fa5b10..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.govspeak.erb
+++ /dev/null
@@ -1,116 +0,0 @@
-<% render_content_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? %>
- You’ll need an electronic visa waiver (EVW) or a visitor visa
- <% else %>
- You’ll need a visa to pass through the UK (unless you’re exempt)
- <% end %>
-<% end %>
-
-<% render_content_for :body do %>
- <% if calculator.passport_country_is_taiwan? %>
-
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
-
- If your passport doesn’t have a personal ID number on the bio data page you’ll usually need to apply for a UK [standard visitor visa](/standard-visitor-visa).
- <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
-
- You must either apply for:
-
- - an [EVW](/get-electronic-visa-waiver)
- - a [Standard Visitor visa](/standard-visitor-visa)
- <% else %>
-
- You’ll usually need to apply for a UK [standard visitor visa](/standard-visitor-visa).
- <% end %>
-
- <% if calculator.passport_country_in_datv_list? ||
- calculator.passport_country_is_taiwan? ||
- calculator.passport_country_in_electronic_visa_waiver_list? ||
- calculator.passport_country_in_visa_national_list? %>
-
- ##Transiting without a visa
-
- You might be eligible for ‘transit without visa’ if:
-
- - you arrive and depart by air
-
- - have a confirmed onward flight that leaves on the day you arrive or before midnight on the day after you arrive
-
- - have the right documents for your destination (for example a visa for that country)
- <% if calculator.passport_country_in_visa_national_list? ||
- calculator.passport_country_is_taiwan? ||
- calculator.passport_country_in_datv_list? ||
- passport_country_in_electronic_visa_waiver_list? %>
-
- You must also have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland.
-
- E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
-
- All visas and residence permits must be valid.
-
- You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules.
-
- <% else %>
-
- You must also:
-
- - be travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
-
- - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
-
- - be travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
-
- - have a residence permit issued by Australia or New Zealand
-
- - have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
-
- - have a residence permit issued by Canada issued after 28 June 2002
-
- - have a uniform format category D visa for entry to a country in the EEA or Switzerland
-
- - have an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
-
- - have a valid USA permanent residence card issued by the USA on or after 21 April 1998
-
- - have a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
-
- - have an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
-
- - have a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- You won’t be able to transit without a visa if a Border Force officer decides you don’t qualify under the immigration rules. You can [apply for a transit visa](/transit-visa) before you travel if you’re unsure whether you qualify for transiting without a visa.
-
- E-visas or e-residence permits are not acceptable for transiting through immigration control without a visa.
-
- All visas and residence permits must be valid.
-
- Australian paper confirmation slips are not accepted.
-
- ^Transiting without a visa is decided by the immigration officer at the border. You won’t be allowed to transit if they decide you need a visa, so you might want to apply for a transit visa before you travel.^
-
- <% end %>
- <% else %>
-
- You don’t need a visa if:
-
- - you’re travelling to (or on part of a reasonable journey to) Australia, Canada, New Zealand or the USA and have a valid visa for that country
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and have a valid visa for that country
- - you’re travelling from (or on part of a reasonable journey from) Australia, Canada, New Zealand or the USA and it’s less than 6 months since you last entered that country with a valid entry visa
-
- You also won’t need a visa if you have any of the following:
-
- - a residence permit issued by Australia or New Zealand
- - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - a residence permit issued by Canada issued after 28 June 2002
- - a uniform format category D visa for entry to a country in the EEA or Switzerland
- - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section) and an onward flight ticket to the Republic of Ireland
- - a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
- - a Taiwanese passport with a personal ID number on the bio data page
- <% end %>
-
-<% end %>
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
new file mode 100644
index 00000000000..c446a430f75
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.erb
@@ -0,0 +1,30 @@
+<% text_for :title do %>
+ You won’t need a visa if you have an ePassport
+<% end %>
+
+<% govspeak_for :body do %>
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
+
+ ^ If you don't have an ePassport, you should apply for a [Direct Airside Transit Visa](/transit-visa/direct-airside-transit-visa) unless you're exempt.
+
+ ##Exemptions
+
+ You don’t need a visa if you have one of the following:
+
+ - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country)
+ - a residence permit issued by Australia or New Zealand
+ - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
+ - a resident permit issued by Canada after 28 June 2002
+ - a uniform format category D visa for entry into a country in the European Economic Area (EEA) or Switzerland
+ - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section)
+ - a Schengen Approved Destination Scheme (ADS) group tourism visa where the holder is travelling to to the Schengen country that issued the visa
+ - a flight ticket from the Schengen area, if you can prove that you entered the Schengen area in the previous 30 days on the basis of a valid Schengen ADS visa
+ - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
+ - a valid USA permanent residence card issued by the USA on or after 21 April 1998
+ - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
+ - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
+
+ All visas and residence permits must be valid.
+
+ E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.govspeak.erb
deleted file mode 100644
index fb67aeb2972..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.govspeak.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<% render_content_for :title do %>
- You won’t need a visa if you have an ePassport
-<% end %>
-
-<% render_content_for :body do %>
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you'd need to apply for a visa, to show to officers at the UK border.
-
- ^ If you don't have an ePassport, you should apply for a [Direct Airside Transit Visa](/transit-visa/direct-airside-transit-visa) unless you're exempt.
-
- ##Exemptions
-
- You don’t need a visa if you have one of the following:
-
- - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country)
- - a residence permit issued by Australia or New Zealand
- - you have a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
- - a resident permit issued by Canada after 28 June 2002
- - a uniform format category D visa for entry into a country in the European Economic Area (EEA) or Switzerland
- - an Irish biometric visa (marked ‘BC’ or ‘BC BIVS’ in the ‘Remarks’ section)
- - a Schengen Approved Destination Scheme (ADS) group tourism visa where the holder is travelling to to the Schengen country that issued the visa
- - a flight ticket from the Schengen area, if you can prove that you entered the Schengen area in the previous 30 days on the basis of a valid Schengen ADS visa
- - a valid USA I-551 Temporary Immigrant visa issued by the USA (a wet-ink stamp version will not be accepted)
- - a valid USA permanent residence card issued by the USA on or after 21 April 1998
- - an expired USA I-551 Permanent Residence card issued by the USA on or after 21 April 1998, with a valid I-797 letter authorising extension
- - a valid standalone US Immigration Form 155A/155B issued by the USA (attached to a sealed brown envelope)
-
- All visas and residence permits must be valid.
-
- E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.
-<% 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
new file mode 100644
index 00000000000..13cf1b4a49f
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ You’ll need an electronic visa waiver (EVW) or a visitor visa
+<% end %>
+
+<% govspeak_for :body do %>
+ You must either apply for:
+
+ + an [EVW](/get-electronic-visa-waiver)
+ + a [Standard Visitor visa](/standard-visitor-visa)
+
+ *[EVW]: electronic visa waiver
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.govspeak.erb
deleted file mode 100644
index fb835de8607..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- You’ll need an electronic visa waiver (EVW) or a visitor visa
-<% end %>
-
-<% render_content_for :body do %>
- You must either apply for:
-
- + an [EVW](/get-electronic-visa-waiver)
- + a [Standard Visitor visa](/standard-visitor-visa)
-
- *[EVW]: electronic visa waiver
-<% 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
new file mode 100644
index 00000000000..c575882a880
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You won't need a visa if your passport has a personal ID number on the bio data page.
+<% end %>
+
+<% govspeak_for :body do %>
+ However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
+
+ ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a Standard Visitor visa](/standard-visitor-visa).^
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.govspeak.erb
deleted file mode 100644
index a7f4625f32c..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You won't need a visa if your passport has a personal ID number on the bio data page.
-<% end %>
-
-<% render_content_for :body do %>
- However, you should bring the [same documents](/government/publications/visitor-visa-guide-to-supporting-documents) you’d need to apply for a visa, to show to officers at the UK border.
-
- ^If the bio data page in your passport doesn’t include a personal ID number, you must [apply for a Standard Visitor visa](/standard-visitor-visa).^
-<% 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
new file mode 100644
index 00000000000..8364e1b7541
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.erb
@@ -0,0 +1,35 @@
+<% text_for :title do %>
+ You'll need a visa to work, do business or academic research in the UK
+
+<% end %>
+
+<% govspeak_for :body do %>
+ The visa you need to apply for depends on your circumstances.
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>
+
+ ##Business visits
+
+ You can apply:
+
+ - for a [Standard Visitor visa](/standard-visitor-visa) - eg if you’re coming to the UK for conferences, meetings, training, academic research or a sabbatical
+ - as a visitor doing a [‘permitted paid engagement’](/permitted-paid-engagement-visa) (you must have been invited to the UK because of your expertise) - you can only stay for up to 1 month
+
+ ##Temporary workers
+
+ A temporary worker visa may be suitable if you want work in the UK for a short time:
+
+ - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
+ - in a [work experience role](/tier-5-government-authorised-exchange)
+ - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
+ - for a [religious organisation](/tier-5-religious)
+ - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
+ - in a [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
+ - in a [skilled job](/tier-2-general)
+
+ You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.govspeak.erb
deleted file mode 100644
index e568f905f50..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.govspeak.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<% render_content_for :title do %>
- You'll need a visa to work, do business or academic research in the UK
-
-<% end %>
-
-<% render_content_for :body do %>
- The visa you need to apply for depends on your circumstances.
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- <%= render partial: 'estonia_or_latvia.govspeak.erb', locals: {calculator: calculator} %>
-
- ##Business visits
-
- You can apply:
-
- - for a [Standard Visitor visa](/standard-visitor-visa) - eg if you’re coming to the UK for conferences, meetings, training, academic research or a sabbatical
- - as a visitor doing a [‘permitted paid engagement’](/permitted-paid-engagement-visa) (you must have been invited to the UK because of your expertise) - you can only stay for up to 1 month
-
- ##Temporary workers
-
- A temporary worker visa may be suitable if you want work in the UK for a short time:
-
- - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
- - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
- - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
- - in a [work experience role](/tier-5-government-authorised-exchange)
- - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
- - for a [religious organisation](/tier-5-religious)
- - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
- - in a [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
- - in a [skilled job](/tier-2-general)
-
- You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
-<% 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
new file mode 100644
index 00000000000..35faf763223
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.erb
@@ -0,0 +1,75 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ You may be able to come to the UK without a visa if you:
+
+ - are invited as an expert in your profession
+ - come for other business or academic activities
+
+ %You may want to [apply for a visa](/browse/visas-immigration/short-visit-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
+
+ ## If you’re invited as an expert
+ You can stay in the UK for up to 1 month without a visa, but you can only be paid to do certain things, eg:
+
+ - give guest lectures at a higher education institution
+ - provide advocacy in legal proceedings
+ - take part in arts, entertainment or sporting activities
+
+ Check the full list of what you can be paid to do - it’s the same as [what you can do on a Permitted Paid Engagement visa](/permitted-paid-engagement-visa).
+
+ ### Documents you need
+ You must show officers at the UK border that you’re eligible for a Permitted Paid Engagement visa, even if you don’t need one.
+
+ <% if calculator.passport_country_in_epassport_gate_list? %>
+ ^You must see a Border Force officer to get a stamp in your passport - do not use the automatic ePassport gates.^
+
+ Without a stamp you will not be able to carry out the activities you came to the UK to do.
+ <% end %>
+
+ Check which [documents you must bring](/permitted-paid-engagement-visa/documents-you-must-provide).
+
+ ## If you come for other business or academic activities
+ You can stay in the UK for up to 6 months without a visa, but you can only do certain academic or business-related activities, eg:
+
+ - go to a conference, meeting or training
+ - take part in a specific sports-related event
+ - perform as an artist, entertainer or musician
+ - do academic research or accompany students on a study abroad programme
+
+ Check the full list of what you can do - it’s the same as [what you can do on a Standard Visitor visa](/standard-visitor-visa).
+
+ ### Documents you need
+ You must show officers at the UK border that you’re eligible for a Standard Visitor visa, even if you don’t need one.
+
+ Check which [documents you must bring](/standard-visitor-visa/documents-you-must-provide).
+
+ ## If you want to work in the UK
+
+ Apply for a temporary worker visa if you want to work in the UK for a short time:
+
+ - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
+ - in a [work experience role](/tier-5-government-authorised-exchange)
+ - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
+ - for a [religious organisation](/tier-5-religious)
+ - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
+ - on a [transfer to your employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
+ - in a [skilled job](/tier-2-general)
+ - in [work covered by international law](/tier-5-international-agreement), eg for a foreign government or as a private servant in a diplomatic household
+
+ ### If your stay is less than 3 months
+ <% if calculator.passport_country_in_epassport_gate_list? %>
+ You do not need a visa for [qualifying work](/tier-5-temporary-worker-creative-and-sporting-visa/tier-5-creative-and-sporting-concession) in sports, arts, or entertainment if you’re coming to the UK for 3 months or less using the Tier 5 (Temporary Worker - Creative and Sporting) concession.
+
+ You must bring a [certificate of sponsorship](/tier-5-temporary-worker-creative-and-sporting-visa/eligibility) and [evidence of savings](/tier-5-temporary-worker-creative-and-sporting-visa/documents-you-must-provide) to show officers at the UK border.
+
+ ^You must see a Border Force officer - do not use the automatic ePassport gates.^
+ <% else %>
+ You don't need a visa for [qualifying work](/tier-5-temporary-worker-creative-and-sporting-visa/overview) in sports, arts or entertainment if you're coming to the UK for less than 3 months.
+
+ You must bring a [certificate of sponsorship](/tier-5-temporary-worker-creative-and-sporting-visa/eligibility) and [evidence of savings](/tier-5-temporary-worker-creative-and-sporting-visa/documents-you-must-provide) to show officers at the UK border.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.govspeak.erb
deleted file mode 100644
index bf58b819a9f..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.govspeak.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- You may be able to come to the UK without a visa if you:
-
- - are invited as an expert in your profession
- - come for other business or academic activities
-
- %You may want to [apply for a visa](/browse/visas-immigration/short-visit-visas) if you have a criminal record or you’ve previously been refused entry into the UK.%
-
- ## If you’re invited as an expert
- You can stay in the UK for up to 1 month without a visa, but you can only be paid to do certain things, eg:
-
- - give guest lectures at a higher education institution
- - provide advocacy in legal proceedings
- - take part in arts, entertainment or sporting activities
-
- Check the full list of what you can be paid to do - it’s the same as [what you can do on a Permitted Paid Engagement visa](/permitted-paid-engagement-visa).
-
- ### Documents you need
- You must show officers at the UK border that you’re eligible for a Permitted Paid Engagement visa, even if you don’t need one.
-
- <% if calculator.passport_country_in_epassport_gate_list? %>
- ^You must see a Border Force officer to get a stamp in your passport - do not use the automatic ePassport gates.^
-
- Without a stamp you will not be able to carry out the activities you came to the UK to do.
- <% end %>
-
- Check which [documents you must bring](/permitted-paid-engagement-visa/documents-you-must-provide).
-
- ## If you come for other business or academic activities
- You can stay in the UK for up to 6 months without a visa, but you can only do certain academic or business-related activities, eg:
-
- - go to a conference, meeting or training
- - take part in a specific sports-related event
- - perform as an artist, entertainer or musician
- - do academic research or accompany students on a study abroad programme
-
- Check the full list of what you can do - it’s the same as [what you can do on a Standard Visitor visa](/standard-visitor-visa).
-
- ### Documents you need
- You must show officers at the UK border that you’re eligible for a Standard Visitor visa, even if you don’t need one.
-
- Check which [documents you must bring](/standard-visitor-visa/documents-you-must-provide).
-
- ## If you want to work in the UK
-
- Apply for a temporary worker visa if you want to work in the UK for a short time:
-
- - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
- - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
- - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
- - in a [work experience role](/tier-5-government-authorised-exchange)
- - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
- - for a [religious organisation](/tier-5-religious)
- - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
- - on a [transfer to your employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
- - in a [skilled job](/tier-2-general)
- - in [work covered by international law](/tier-5-international-agreement), eg for a foreign government or as a private servant in a diplomatic household
-
- ### If your stay is less than 3 months
- <% if calculator.passport_country_in_epassport_gate_list? %>
- You do not need a visa for [qualifying work](/tier-5-temporary-worker-creative-and-sporting-visa/tier-5-creative-and-sporting-concession) in sports, arts, or entertainment if you’re coming to the UK for 3 months or less using the Tier 5 (Temporary Worker - Creative and Sporting) concession.
-
- You must bring a [certificate of sponsorship](/tier-5-temporary-worker-creative-and-sporting-visa/eligibility) and [evidence of savings](/tier-5-temporary-worker-creative-and-sporting-visa/documents-you-must-provide) to show officers at the UK border.
-
- ^You must see a Border Force officer - do not use the automatic ePassport gates.^
- <% else %>
- You don't need a visa for [qualifying work](/tier-5-temporary-worker-creative-and-sporting-visa/overview) in sports, arts or entertainment if you're coming to the UK for less than 3 months.
-
- You must bring a [certificate of sponsorship](/tier-5-temporary-worker-creative-and-sporting-visa/eligibility) and [evidence of savings](/tier-5-temporary-worker-creative-and-sporting-visa/documents-you-must-provide) to show officers at the UK border.
- <% end %>
-<% 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
new file mode 100644
index 00000000000..2202d0114ea
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.erb
@@ -0,0 +1,33 @@
+<% text_for :title do %>
+ You'll need to apply to do business, academic research or work in the UK
+
+<% end %>
+
+<% govspeak_for :body do %>
+ What you need to apply for depends on your circumstances.
+
+ ##Business and academic visits
+
+ You can apply:
+
+ - for a [Standard Visitor visa](/standard-visitor-visa) or an [electronic visa waiver](/get-electronic-visa-waiver) (EVW) - eg if you’re coming to the UK for conferences, meetings, training, academic research or a sabbatical
+ - as a visitor doing a [‘permitted paid engagement’](/permitted-paid-engagement-visa) (you must have been invited to the UK because of your expertise) - you can only stay for up to 1 month
+
+ ##Temporary workers
+
+ A temporary worker visa may be suitable if you want work in the UK for a short time:
+
+ - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
+ - in a [work experience role](/tier-5-government-authorised-exchange)
+ - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
+ - for a [religious organisation](/tier-5-religious)
+ - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
+ - in a [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
+ - in a [skilled job](/tier-2-general)
+
+ You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
+
+ *[EVW]: electronic visa waiver
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.govspeak.erb
deleted file mode 100644
index 44185698ed5..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% render_content_for :title do %>
- You'll need to apply to do business, academic research or work in the UK
-
-<% end %>
-
-<% render_content_for :body do %>
- What you need to apply for depends on your circumstances.
-
- ##Business and academic visits
-
- You can apply:
-
- - for a [Standard Visitor visa](/standard-visitor-visa) or an [electronic visa waiver](/get-electronic-visa-waiver) (EVW) - eg if you’re coming to the UK for conferences, meetings, training, academic research or a sabbatical
- - as a visitor doing a [‘permitted paid engagement’](/permitted-paid-engagement-visa) (you must have been invited to the UK because of your expertise) - you can only stay for up to 1 month
-
- ##Temporary workers
-
- A temporary worker visa may be suitable if you want work in the UK for a short time:
-
- - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
- - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
- - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
- - in a [work experience role](/tier-5-government-authorised-exchange)
- - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
- - for a [religious organisation](/tier-5-religious)
- - as a [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
- - in a [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa)
- - in a [skilled job](/tier-2-general)
-
- You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
-
- *[EVW]: electronic visa waiver
-<% 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
new file mode 100644
index 00000000000..91ca9828a85
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.erb
@@ -0,0 +1,63 @@
+<% text_for :title do %>
+ You’ll need a visa to work or do business or academic research in the UK
+<% end %>
+
+<% govspeak_for :body do %>
+ The visa you apply for depends on your circumstances.
+
+ <% if calculator.passport_country_is_turkey? %>
+ ###Turkish nationals
+
+ You can apply for a [Turkish business person visa](/turkish-business-person) if you want to come and set up a business in the UK.
+ <% end %>
+
+ <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>
+
+ ###Skilled workers
+
+ A ‘skilled worker’ visa may be suitable if you’ve been offered a:
+
+ - [skilled job ](/tier-2-general) in the UK
+ - [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa) - the visa you apply for depends on your circumstances
+ - [job in a religious community](/tier-2-minister-of-religion-visa)
+ - job as an [elite sportsperson or coach](/tier-2-sportsperson-worker-visa)
+
+ ###Temporary workers
+
+ <% if calculator.passport_country_in_youth_mobility_scheme_list? %>
+ You can apply for the [‘youth mobility scheme’ visa](/tier-5-youth-mobility) if you want to live and work in the UK for up to 2 years.
+ <% end %>
+
+ A ‘temporary worker’ visa may be suitable if you want work in the UK for a short time:
+
+ - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
+ - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
+ - in a [work experience role](/tier-5-government-authorised-exchange)
+ - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
+ - for a [religious organisation](/tier-5-religious)
+
+ You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
+
+ ###'High value' workers
+
+ A ‘high value worker’ visa may be suitable if you’re:
+
+ - an [investor](/tier-1-investor)
+ - an [entrepreneur](/tier-1-entrepreneur)
+ - a [graduate entrepreneur](/tier-1-graduate-entrepreneur-visa)
+ - a [leader in arts or sciences](/tier-1-exceptional-talent)
+
+ ###Commonwealth citizens
+
+ You may be eligible for a [UK ancestry visa](/ancestry-visa) if one of your grandparents was born in the UK.
+
+ ###Other workers
+
+ You can also apply as a:
+
+ - [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
+ - [representative of an overseas business](/representative-overseas-business)
+
+ <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.govspeak.erb
deleted file mode 100644
index 84b260fa55c..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-<% render_content_for :title do %>
- You’ll need a visa to work or do business or academic research in the UK
-<% end %>
-
-<% render_content_for :body do %>
- The visa you apply for depends on your circumstances.
-
- <% if calculator.passport_country_is_turkey? %>
- ###Turkish nationals
-
- You can apply for a [Turkish business person visa](/turkish-business-person) if you want to come and set up a business in the UK.
- <% end %>
-
- <%= render partial: 'stateless_or_refugee.govspeak.erb', locals: {calculator: calculator} %>
-
- ###Skilled workers
-
- A ‘skilled worker’ visa may be suitable if you’ve been offered a:
-
- - [skilled job ](/tier-2-general) in the UK
- - [role in your overseas employer’s UK branch](/tier-2-intracompany-transfer-worker-visa) - the visa you apply for depends on your circumstances
- - [job in a religious community](/tier-2-minister-of-religion-visa)
- - job as an [elite sportsperson or coach](/tier-2-sportsperson-worker-visa)
-
- ###Temporary workers
-
- <% if calculator.passport_country_in_youth_mobility_scheme_list? %>
- You can apply for the [‘youth mobility scheme’ visa](/tier-5-youth-mobility) if you want to live and work in the UK for up to 2 years.
- <% end %>
-
- A ‘temporary worker’ visa may be suitable if you want work in the UK for a short time:
-
- - in [sports](/tier-5-temporary-worker-creative-and-sporting-visa)
- - in [arts or entertainment](/tier-5-temporary-worker-creative-and-sporting-visa)
- - as a [volunteer](/tier-5-temporary-worker-charity-worker-visa)
- - in a [work experience role](/tier-5-government-authorised-exchange)
- - for a [charity](/tier-5-temporary-worker-charity-worker-visa)
- - for a [religious organisation](/tier-5-religious)
-
- You can also apply for an [international agreement](/tier-5-international-agreement) visa if you’ll be doing work covered by international law while in the UK (eg working for a foreign government or as a private servant in a diplomatic household).
-
- ###'High value' workers
-
- A ‘high value worker’ visa may be suitable if you’re:
-
- - an [investor](/tier-1-investor)
- - an [entrepreneur](/tier-1-entrepreneur)
- - a [graduate entrepreneur](/tier-1-graduate-entrepreneur-visa)
- - a [leader in arts or sciences](/tier-1-exceptional-talent)
-
- ###Commonwealth citizens
-
- You may be eligible for a [UK ancestry visa](/ancestry-visa) if one of your grandparents was born in the UK.
-
- ###Other workers
-
- You can also apply as a:
-
- - [domestic worker in a private household](/domestic-workers-in-a-private-household-visa)
- - [representative of an overseas business](/representative-overseas-business)
-
- <%= render partial: 'estonia_or_latvia.govspeak.erb', locals: {calculator: calculator} %>
-<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/_purpose_of_visit_options.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/_purpose_of_visit_options.erb
similarity index 100%
rename from lib/smart_answer_flows/check-uk-visa/questions/_purpose_of_visit_options.govspeak.erb
rename to lib/smart_answer_flows/check-uk-visa/questions/_purpose_of_visit_options.erb
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
new file mode 100644
index 00000000000..a2869b74e18
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Do you have an Article 10 or 20 card?
+<% end %>
+
+<% govspeak_for :body do %>
+
+ You only get one of these if you're both of the following:
+
+ - the family member of an EEA citizen
+ - living in a different EEA country than the one your family member is from
+
+ Find out more about [Article 10 or 20 cards](/government/publications/entering-the-uk-as-the-holder-of-an-article-10-residence-card/entering-the-uk-as-the-holder-of-an-article-10-residence-card).
+
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.govspeak.erb
deleted file mode 100644
index 7832346895f..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Do you have an Article 10 or 20 card?
-<% end %>
-
-<% render_content_for :body do %>
-
- You only get one of these if you're both of the following:
-
- - the family member of an EEA citizen
- - living in a different EEA country than the one your family member is from
-
- Find out more about [Article 10 or 20 cards](/government/publications/entering-the-uk-as-the-holder-of-an-article-10-residence-card/entering-the-uk-as-the-holder-of-an-article-10-residence-card).
-
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..56c2c950ef2
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ What are you coming to the Channel Islands or Isle of Man to do?
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if calculator.passport_country_in_ukot_list? ||
+ calculator.passport_country_in_non_visa_national_list? %>
+ You might need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.
+ <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
+ You’ll need a UK visa or an [Electronic Visa Waiver](/get-electronic-visa-waiver) if you don’t have a visa (or wet ink stamp) for the Channel Islands or the Isle of Man.
+ <% elsif calculator.passport_country_in_datv_list? ||
+ calculator.passport_country_in_visa_national_list? %>
+ You’ll need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.
+ <% else %>
+ You’ll need a UK visa to come to the Channel Islands or the Isle of Man.
+ <% end %>
+<% end %>
+
+<%= render partial: 'purpose_of_visit_options', locals: { tourism_friends_family: true } %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.govspeak.erb
deleted file mode 100644
index 43b06414dba..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- What are you coming to the Channel Islands or Isle of Man to do?
-<% end %>
-
-<% render_content_for :body do %>
- <% if calculator.passport_country_in_ukot_list? ||
- calculator.passport_country_in_non_visa_national_list? %>
- You might need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.
- <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
- You’ll need a UK visa or an [Electronic Visa Waiver](/get-electronic-visa-waiver) if you don’t have a visa (or wet ink stamp) for the Channel Islands or the Isle of Man.
- <% elsif calculator.passport_country_in_datv_list? ||
- calculator.passport_country_in_visa_national_list? %>
- You’ll need a UK visa if you don’t have a visa (or a wet ink stamp) for the Channel Islands or the Isle of Man.
- <% else %>
- You’ll need a UK visa to come to the Channel Islands or the Isle of Man.
- <% end %>
-<% end %>
-
-<%= render partial: 'purpose_of_visit_options.govspeak.erb', locals: { tourism_friends_family: true } %>
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
new file mode 100644
index 00000000000..b0b646a55d4
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ What sort of passport do you have?
+<% end %>
+
+<% options(
+ "full-passport": "Full passport",
+ "provisional-passport": "Provisional passport ('travel document in lieu of a national passport')"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.govspeak.erb
deleted file mode 100644
index 0eb4d8afe63..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- What sort of passport do you have?
-<% end %>
-
-<% options(
- "full-passport": "Full passport",
- "provisional-passport": "Provisional passport ('travel document in lieu of a national passport')"
-) %>
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
new file mode 100644
index 00000000000..1ffb5ae9a29
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your partner or family member a British citizen, or settled in the UK?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.govspeak.erb
deleted file mode 100644
index e27f96ad4d0..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your partner or family member a British citizen, or settled in the UK?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..a1626a7d522
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your partner or family member from the European Economic Area (EEA)?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.govspeak.erb
deleted file mode 100644
index 2676f896f4e..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your partner or family member from the European Economic Area (EEA)?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..2865deb7b4b
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.erb
@@ -0,0 +1,24 @@
+<% text_for :title do %>
+ Will you pass through UK border control?
+<% end %>
+
+<% govspeak_for :body do %>
+
+ You always pass through border control if you:
+
+ - leave the main airport building for any reason
+ - need to collect your bags and check them in to your onward flight
+
+ You must also pass through border control if both:
+
+ - your onward flight leaves on a different calendar day to when you arrive
+ - there’s nowhere for you to stay overnight in the airport, for example in a transit hotel
+
+ ^Check with your airline if you’re not sure if you’ll pass through border control.^
+
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.govspeak.erb
deleted file mode 100644
index f5cbc824507..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.govspeak.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% render_content_for :title do %>
- Will you pass through UK border control?
-<% end %>
-
-<% render_content_for :body do %>
-
- You always pass through border control if you:
-
- - leave the main airport building for any reason
- - need to collect your bags and check them in to your onward flight
-
- You must also pass through border control if both:
-
- - your onward flight leaves on a different calendar day to when you arrive
- - there’s nowhere for you to stay overnight in the airport, for example in a transit hotel
-
- ^Check with your airline if you’re not sure if you’ll pass through border control.^
-
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..310573a52c6
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ What are you coming to the UK to do?
+<% end %>
+
+<%= render partial: 'purpose_of_visit_options' %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.govspeak.erb
deleted file mode 100644
index b196fa14bb2..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- What are you coming to the UK to do?
-<% end %>
-
-<%= render partial: 'purpose_of_visit_options.govspeak.erb' %>
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
new file mode 100644
index 00000000000..a8f3567f9ab
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How long are you planning to <%= study_or_work %> in the UK for?
+<% end %>
+
+<% options(
+ "six_months_or_less": "6 months or less",
+ "longer_than_six_months": "longer than 6 months"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.govspeak.erb
deleted file mode 100644
index 9b24d0c3bcd..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How long are you planning to <%= study_or_work %> in the UK for?
-<% end %>
-
-<% options(
- "six_months_or_less": "6 months or less",
- "longer_than_six_months": "longer than 6 months"
-) %>
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
new file mode 100644
index 00000000000..5744934fcad
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where are you travelling to?
+<% end %>
+
+<% options(
+ "channel_islands_or_isle_of_man": "Channel Islands or Isle of Man",
+ "republic_of_ireland": "Republic of Ireland",
+ "somewhere_else": "Somewhere else"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.govspeak.erb
deleted file mode 100644
index 08b8ebcf7cb..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where are you travelling to?
-<% end %>
-
-<% options(
- "channel_islands_or_isle_of_man": "Channel Islands or Isle of Man",
- "republic_of_ireland": "Republic of Ireland",
- "somewhere_else": "Somewhere else"
-) %>
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
new file mode 100644
index 00000000000..bc0594f5205
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Will you be travelling with or visiting either your partner or a family member in
+ the UK?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.govspeak.erb
deleted file mode 100644
index 1393dde8e9a..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Will you be travelling with or visiting either your partner or a family member in
- the UK?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..38e749faf06
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What’s your nationality as shown on your passport or travel document?
+<% end %>
+
+<% 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_passport_do_you_have.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.govspeak.erb
deleted file mode 100644
index 2e9e13575a2..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What’s your nationality as shown on your passport or travel document?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..18c249d3039
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ What sort of passport do you have?
+<% end %>
+
+<% if calculator.passport_country_is_estonia? %>
+ <% options(
+ "citizen": "Estonian passport",
+ "alien": "Välismaalase pass",
+ ) %>
+<% elsif calculator.passport_country_is_latvia? %>
+ <% options(
+ "citizen": "Latvian passport",
+ "alien": "Nepilsona Pase",
+ ) %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.govspeak.erb
deleted file mode 100644
index 02733d5d491..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- What sort of passport do you have?
-<% end %>
-
-<% if calculator.passport_country_is_estonia? %>
- <% options(
- "citizen": "Estonian passport",
- "alien": "Välismaalase pass",
- ) %>
-<% elsif calculator.passport_country_is_latvia? %>
- <% options(
- "citizen": "Latvian passport",
- "alien": "Nepilsona Pase",
- ) %>
-<% 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
new file mode 100644
index 00000000000..7436f43c542
--- /dev/null
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ What sort of travel document do you have?
+<% end %>
+
+<% if calculator.passport_country_is_hong_kong? %>
+ <% options(
+ "passport": "Hong Kong passport",
+ "travel_document": "Hong Kong travel document",
+ ) %>
+<% elsif calculator.passport_country_is_macao? %>
+ <% options(
+ "passport": "Macao passport",
+ "travel_document": "Macao travel document",
+ ) %>
+<% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.govspeak.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.govspeak.erb
deleted file mode 100644
index 0a0d88da606..00000000000
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- What sort of travel document do you have?
-<% end %>
-
-<% if calculator.passport_country_is_hong_kong? %>
- <% options(
- "passport": "Hong Kong passport",
- "travel_document": "Hong Kong travel document",
- ) %>
-<% elsif calculator.passport_country_is_macao? %>
- <% options(
- "passport": "Macao passport",
- "travel_document": "Macao travel document",
- ) %>
-<% 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
new file mode 100644
index 00000000000..c3bd020af3b
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.erb
@@ -0,0 +1,28 @@
+<% text_for :title do %>
+ Tax credits: work out your childcare costs
+<% end %>
+
+<% text_for :meta_description do %>
+ Work out your eligible weekly childcare costs, when to report a change in costs
+<% end %>
+
+<% govspeak_for :body do %>
+ You can calculate your childcare costs to report to the Tax Credit Office.
+
+ If you already claim tax credits and your childcare costs have changed, [you might need to report the change](/changes-affect-tax-credits).
+
+ ^Tax credits have been replaced by Universal Credit for most people. [Check if you can make a new claim for tax credits](/claim-tax-credits).
+<% end %>
+
+<% govspeak_for :post_body do %>
+ You must include the childcare costs you pay in total, even if you have more than one child.
+
+ Normally the more childcare costs you pay, the more Child Tax Credit you’ll get.
+
+ You should not include:
+
+ - childcare payments from your employer, in money or childcare vouchers
+ - childcare vouchers from your employer in return for a ‘salary sacrifice' (a reduction in your pay)
+ - childcare payments or grants from a government scheme, for example to help you start work or because you're a student
+ - childcare costs paid by an educational or local authority, for example free early learning or nursery education
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.govspeak.erb
deleted file mode 100644
index 3255603fd39..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :title do %>
- Tax credits: work out your childcare costs
-<% end %>
-
-<% render_content_for :meta_description do %>
- Work out your eligible weekly childcare costs, when to report a change in costs
-<% end %>
-
-<% render_content_for :body do %>
- You can calculate your childcare costs to report to the Tax Credit Office.
-
- If you already claim tax credits and your childcare costs have changed, [you might need to report the change](/changes-affect-tax-credits).
-
- ^Tax credits have been replaced by Universal Credit for most people. [Check if you can make a new claim for tax credits](/claim-tax-credits).
-<% end %>
-
-<% render_content_for :post_body do %>
- You must include the childcare costs you pay in total, even if you have more than one child.
-
- Normally the more childcare costs you pay, the more Child Tax Credit you’ll get.
-
- You should not include:
-
- - childcare payments from your employer, in money or childcare vouchers
- - childcare vouchers from your employer in return for a ‘salary sacrifice' (a reduction in your pay)
- - childcare payments or grants from a government scheme, for example to help you start work or because you're a student
- - childcare costs paid by an educational or local authority, for example free early learning or nursery education
-<% 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
new file mode 100644
index 00000000000..c32b4f1a2df
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Call the Tax Credit Helpline to work out your average weekly childcare costs.
+<% end %>
+
+<% govspeak_for :body do %>
+ You’ll need to tell them:
+
+ - the start and end date of the childcare
+
+ - how much you spent on childcare for the short period
+ - your childcare provider’s details - their name, address, phone number, childcare registration or approval number
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.govspeak.erb
deleted file mode 100644
index ba44f13e850..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Call the Tax Credit Helpline to work out your average weekly childcare costs.
-<% end %>
-
-<% render_content_for :body do %>
- You’ll need to tell them:
-
- - the start and end date of the childcare
-
- - how much you spent on childcare for the short period
- - your childcare provider’s details - their name, address, phone number, childcare registration or approval number
-<% 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
new file mode 100644
index 00000000000..372ceb4309d
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.erb
@@ -0,0 +1,3 @@
+<% 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/call_helpline_plain.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.govspeak.erb
deleted file mode 100644
index 31999bd848e..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..79380d9c9cf
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ Your average weekly childcare costs have <%= title_change_text %> by <%= format_money(difference_money) %>.
+<% end %>
+
+<% govspeak_for :body do %>
+ <% if ten_or_more %>
+ <% if cost_change_4_weeks %>
+ Call the Tax Credit Office if you expect this to last for 4 weeks in a row or more.
+
+ You don’t need to report it if this won’t last 4 weeks in a row or more.
+ <% else %>
+ Tell the Tax Credit Office so they can adjust your tax credit.
+ <% end %>
+ <% else %>
+ This doesn’t affect your tax credits. You don’t need to report it.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.govspeak.erb
deleted file mode 100644
index c00a27f5445..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- Your average weekly childcare costs have <%= title_change_text %> by <%= format_money(difference_money) %>.
-<% end %>
-
-<% render_content_for :body do %>
- <% if ten_or_more %>
- <% if cost_change_4_weeks %>
- Call the Tax Credit Office if you expect this to last for 4 weeks in a row or more.
-
- You don’t need to report it if this won’t last 4 weeks in a row or more.
- <% else %>
- Tell the Tax Credit Office so they can adjust your tax credit.
- <% end %>
- <% else %>
- This doesn’t affect your tax credits. You don’t need to report it.
- <% end %>
-<% 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
new file mode 100644
index 00000000000..c3204bed0a6
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ There is no change to your tax credits.
+<% end %>
+
+<% govspeak_for :body do %>
+ You don’t have to report anything to the Tax Credit Office.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.govspeak.erb
deleted file mode 100644
index a4b55b76402..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- There is no change to your tax credits.
-<% end %>
-
-<% render_content_for :body do %>
- You don’t have to report anything to the Tax Credit Office.
-<% 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
new file mode 100644
index 00000000000..f2337f07f74
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ You’re no longer paying for childcare.
+<% end %>
+
+<% govspeak_for :body do %>
+ If you expect this to last for 4 weeks or more, tell the [Tax Credit Office](/contact-the-tax-credit-office "Contact the Tax Credit Office").
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.govspeak.erb
deleted file mode 100644
index cfce661cc52..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- You’re no longer paying for childcare.
-<% end %>
-
-<% render_content_for :body do %>
- If you expect this to last for 4 weeks or more, tell the [Tax Credit Office](/contact-the-tax-credit-office "Contact the Tax Credit Office").
-<% 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
new file mode 100644
index 00000000000..b0e917ab661
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ Round up the amount you pay each week to the nearest pound to get your weekly childcare cost.
+<% end %>
+
+<% govspeak_for :body do %>
+ Use that figure on your claim form.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.govspeak.erb
deleted file mode 100644
index 1635b92a8a9..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- Round up the amount you pay each week to the nearest pound to get your weekly childcare cost.
-<% end %>
-
-<% render_content_for :body do %>
- Use that figure on your claim form.
-<% 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
new file mode 100644
index 00000000000..ff8e3b85057
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ Your weekly childcare costs are <%= format_money(weekly_cost) %>.
+<% end %>
+
+<% govspeak_for :body do %>
+ Use this figure on your claim form.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.govspeak.erb
deleted file mode 100644
index 163cd4c538a..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- Your weekly childcare costs are <%= format_money(weekly_cost) %>.
-<% end %>
-
-<% render_content_for :body do %>
- Use this figure on your claim form.
-<% 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
new file mode 100644
index 00000000000..ff15f2f3b3f
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you currently claiming tax credits for childcare costs?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.govspeak.erb
deleted file mode 100644
index 132a9a826b8..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you currently claiming tax credits for childcare costs?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..1598604fb93
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Have the costs of your childcare changed since you last made your claim?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.govspeak.erb
deleted file mode 100644
index 8efa931b344..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Have the costs of your childcare changed since you last made your claim?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..b48797a5085
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much do you expect to pay in total for childcare for the next 12 months?
+<% end %>
+
+<% 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_1.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.govspeak.erb
deleted file mode 100644
index c18c3eade78..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..41127235065
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.erb
@@ -0,0 +1,3 @@
+<% 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_12_months_2.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.govspeak.erb
deleted file mode 100644
index a5acd8a7a15..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..6fa48c985f9
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.erb
@@ -0,0 +1,3 @@
+<% 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_4_weeks.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.govspeak.erb
deleted file mode 100644
index a3b4130e0e2..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..5dfc2c6176c
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much do you expect to pay in total for childcare for the next 52 weeks?
+<% end %>
+
+<% 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_1.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.govspeak.erb
deleted file mode 100644
index 0f00cab9a5c..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..b4bede51210
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.erb
@@ -0,0 +1,3 @@
+<% 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_52_weeks_2.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.govspeak.erb
deleted file mode 100644
index ed51743690c..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..f00d7be3071
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.erb
@@ -0,0 +1,3 @@
+<% 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_each_month.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.govspeak.erb
deleted file mode 100644
index 789011bcb03..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..212df882f8a
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.erb
@@ -0,0 +1,3 @@
+<% 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_fortnightly.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.govspeak.erb
deleted file mode 100644
index f2866436f68..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..2b20be596df
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much have you spent on childcare in the last 12 months?
+<% end %>
+
+<% 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_spent_last_12_months.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.govspeak.erb
deleted file mode 100644
index ccbb646715c..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How much have you spent on childcare in the last 12 months?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..18fd7a7a759
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.erb
@@ -0,0 +1,3 @@
+<% 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_much_yearly.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.govspeak.erb
deleted file mode 100644
index cfb0ffd362f..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..c19b6aebdf4
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often do you pay your childcare provider(s)?
+<% end %>
+
+<% options(
+ "weekly_same_amount": "Weekly, and I always pay the same amount",
+ "weekly_diff_amount": "Weekly, and the amount I pay varies",
+ "monthly_same_amount": "Monthly, and I always pay the same amount",
+ "monthly_diff_amount": "Monthly, and the amount I pay varies",
+ "other": "Other"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.govspeak.erb
deleted file mode 100644
index f15cc392706..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay your childcare provider(s)?
-<% end %>
-
-<% options(
- "weekly_same_amount": "Weekly, and I always pay the same amount",
- "weekly_diff_amount": "Weekly, and the amount I pay varies",
- "monthly_same_amount": "Monthly, and I always pay the same amount",
- "monthly_diff_amount": "Monthly, and the amount I pay varies",
- "other": "Other"
-) %>
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
new file mode 100644
index 00000000000..c19b6aebdf4
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often do you pay your childcare provider(s)?
+<% end %>
+
+<% options(
+ "weekly_same_amount": "Weekly, and I always pay the same amount",
+ "weekly_diff_amount": "Weekly, and the amount I pay varies",
+ "monthly_same_amount": "Monthly, and I always pay the same amount",
+ "monthly_diff_amount": "Monthly, and the amount I pay varies",
+ "other": "Other"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.govspeak.erb
deleted file mode 100644
index f15cc392706..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay your childcare provider(s)?
-<% end %>
-
-<% options(
- "weekly_same_amount": "Weekly, and I always pay the same amount",
- "weekly_diff_amount": "Weekly, and the amount I pay varies",
- "monthly_same_amount": "Monthly, and I always pay the same amount",
- "monthly_diff_amount": "Monthly, and the amount I pay varies",
- "other": "Other"
-) %>
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
new file mode 100644
index 00000000000..5fb516e1572
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How often do you pay your childcare provider(s)?
+<% end %>
+
+<% options(
+ "weekly": "Weekly",
+ "fortnightly": "Fortnightly",
+ "every_4_weeks": "Every 4 weeks",
+ "every_month": "Every calendar month",
+ "termly": "Termly",
+ "yearly": "Yearly",
+ "other": "Other"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.govspeak.erb
deleted file mode 100644
index 9c3c459b338..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay your childcare provider(s)?
-<% end %>
-
-<% options(
- "weekly": "Weekly",
- "fortnightly": "Fortnightly",
- "every_4_weeks": "Every 4 weeks",
- "every_month": "Every calendar month",
- "termly": "Termly",
- "yearly": "Yearly",
- "other": "Other"
-) %>
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
new file mode 100644
index 00000000000..250c388a1bf
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ How often do you use childcare?
+<% end %>
+
+<% options(
+ "regularly_less_than_year": "I’ve been using childcare regularly for less than a year",
+ "regularly_more_than_year": "I've been using childcare regularly for a year or more",
+ "only_short_while": "I only use childcare for short periods once in a while"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.govspeak.erb
deleted file mode 100644
index 08cc7d8fa55..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- How often do you use childcare?
-<% end %>
-
-<% options(
- "regularly_less_than_year": "I’ve been using childcare regularly for less than a year",
- "regularly_more_than_year": "I've been using childcare regularly for a year or more",
- "only_short_while": "I only use childcare for short periods once in a while"
-) %>
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
new file mode 100644
index 00000000000..d5ab083abb5
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.erb
@@ -0,0 +1,3 @@
+<% 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_monthly_cost.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.govspeak.erb
deleted file mode 100644
index 2170e35138b..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..cbc3b440984
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What are your new weekly costs?
+<% end %>
+
+<% 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/new_weekly_costs.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.govspeak.erb
deleted file mode 100644
index 5bb93b2d6f5..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What are your new weekly costs?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..da51aea78aa
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the old monthly amount you gave the Tax Credit Office?
+<% end %>
+
+<% text_for :hint do %>
+ Round the total up to the nearest pound.
+<% end %>
+
+<% govspeak_for :post_body do %>
+ If you don’t know what your previous childcare costs were, check your award or renewal notice.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.govspeak.erb
deleted file mode 100644
index c3661ceefb2..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the old monthly amount you gave the Tax Credit Office?
-<% end %>
-
-<% render_content_for :hint do %>
- Round the total up to the nearest pound.
-<% end %>
-
-<% render_content_for :post_body do %>
- If you don’t know what your previous childcare costs were, check your award or renewal notice.
-<% 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
new file mode 100644
index 00000000000..063da808b41
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the old average weekly amount you gave the Tax Credit Office?
+<% end %>
+
+<% text_for :hint do %>
+ Round the total up to the nearest pound.
+<% end %>
+
+<% govspeak_for :post_body do %>
+ If you don’t know what your previous childcare costs were, check your award or renewal notice.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.govspeak.erb
deleted file mode 100644
index fdf5254fea8..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the old average weekly amount you gave the Tax Credit Office?
-<% end %>
-
-<% render_content_for :hint do %>
- Round the total up to the nearest pound.
-<% end %>
-
-<% render_content_for :post_body do %>
- If you don’t know what your previous childcare costs were, check your award or renewal notice.
-<% 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
new file mode 100644
index 00000000000..063da808b41
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the old average weekly amount you gave the Tax Credit Office?
+<% end %>
+
+<% text_for :hint do %>
+ Round the total up to the nearest pound.
+<% end %>
+
+<% govspeak_for :post_body do %>
+ If you don’t know what your previous childcare costs were, check your award or renewal notice.
+<% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.govspeak.erb
deleted file mode 100644
index fdf5254fea8..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the old average weekly amount you gave the Tax Credit Office?
-<% end %>
-
-<% render_content_for :hint do %>
- Round the total up to the nearest pound.
-<% end %>
-
-<% render_content_for :post_body do %>
- If you don’t know what your previous childcare costs were, check your award or renewal notice.
-<% 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
new file mode 100644
index 00000000000..e9c4ad6619b
--- /dev/null
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do you pay the same each time?
+<% end %>
+
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.govspeak.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.govspeak.erb
deleted file mode 100644
index 3658bbb56e3..00000000000
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do you pay the same each time?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..05eccc1ef7e
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.erb
@@ -0,0 +1,27 @@
+<% text_for :title do %>
+ Check if you should go back into work
+<% end %>
+
+<% text_for :meta_description do %>
+ Use this service to find out if you should go back to work during this phase of coronavirus lockdown, and what you can do if you should not be going into work.
+<% end %>
+
+<% govspeak_for :body do %>
+ Use this service to find out if you should go back to work during this phase of coronavirus lockdown, and what you can do if you should not be going into work.
+
+ If you’re currently on furlough you can stay on furlough. However, if you are asked to come off furlough by your employer, you can use this service to find out if you should be going back into work, and how to return to work safely.
+
+ You will be asked about your:
+
+ - type of work
+ - health
+ - household
+
+ ^If you or anyone in your household currently have symptoms of coronavirus then you must not go to work.
+
+ This guidance is only for England.
+
+ Guidance from the [Scottish Government](https://www.gov.scot/publications/coronavirus-covid-19-phase-1-returning-to-work/), [Welsh Government](https://gov.wales/work-skills-financial-support) and [Northern Ireland Assembly](https://www.nidirect.gov.uk/articles/coronavirus-covid-19-advice-workers) is also available.
+
+
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.govspeak.erb
deleted file mode 100644
index 672f21a3fb8..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :title do %>
- Check if you should go back into work
-<% end %>
-
-<% text_for :meta_description do %>
- Use this service to find out if you should go back to work during this phase of coronavirus lockdown, and what you can do if you should not be going into work.
-<% end %>
-
-<% render_content_for :body do %>
- Use this service to find out if you should go back to work during this phase of coronavirus lockdown, and what you can do if you should not be going into work.
-
- If you’re currently on furlough you can stay on furlough. However, if you are asked to come off furlough by your employer, you can use this service to find out if you should be going back into work, and how to return to work safely.
-
- You will be asked about your:
-
- - type of work
- - health
- - household
-
- ^If you or anyone in your household currently have symptoms of coronavirus then you must not go to work.
-
- This guidance is only for England.
-
- Guidance from the [Scottish Government](https://www.gov.scot/publications/coronavirus-covid-19-phase-1-returning-to-work/), [Welsh Government](https://gov.wales/work-skills-financial-support) and [Northern Ireland Assembly](https://www.nidirect.gov.uk/articles/coronavirus-covid-19-advice-workers) is also available.
-
-
-<% 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
new file mode 100644
index 00000000000..9399f867b71
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.erb
@@ -0,0 +1,64 @@
+<% text_for :title do %>
+ You can go back to work
+<% end %>
+
+<% govspeak_for :body do %>
+
+ <% if calculator.are_you_vulnerable == "yes" %>
+ $CTA
+ ## If you are clinically vulnerable: get your employer to make arrangements for you to work safely
+
+ Clinically vulnerable people are at higher risk of severe illness (for example, people with pre-existing conditions). Therefore, you should take extra care in observing social distancing. Your employer should help you to work from home, either in your current role or in an alternative role.
+
+ If you are clinically vulnerable (but not extremely clinically vulnerable) and cannot work from home, your employer should offer you the option of the safest available on-site roles, enabling you to stay 2 metres away from others.
+
+ If you have to spend time within 2 metres of others, employers should carefully assess whether this involves an acceptable level of risk. As for any workplace risk, employers must take into account specific duties to those with protected characteristics, including, for example, pregnant women who are entitled to a suspension on full pay if suitable roles cannot be found.
+
+ [Find out more about how to work safely in your workplace](/coronavirus-business-reopening)
+ $CTA
+ <% end %>
+
+ <% if calculator.do_you_live_with_someone_vulnerable == "yes" %>
+ $CTA
+ ## If you live with someone extremely clinically vulnerable: get advice on how to socially distance at work and keep your household safe
+
+ If you cannot work from home, you should make sure your employer is following guidance on [how to work safely during the coronavirus pandemic](/coronavirus-business-reopening).
+
+ Employers should pay particular attention to people who live with clinically extremely vulnerable individuals.
+
+ You and your household should follow the [guidance on how to protect clinically extremely vulnerable people](/government/publications/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19#living-with-other-people).
+ $CTA
+ <% end %>
+
+ <% if calculator.have_childcare_responsibility == "yes" %>
+ $CTA
+ ## If you need help with childcare or dependants: Find out if you can send your children back to school or take time off
+
+ ### Schools and childcare
+ Schools in England may open for:
+
+ - primary schools for children in reception, year 1 and year 6
+ - nurseries and other early years settings, including childminders
+ - children of key workers and vulnerable children
+
+ [Find out if you are classed as a key worker, and if you can send your children back to school](/government/publications/coronavirus-covid-19-maintaining-educational-provision/guidance-for-schools-colleges-and-local-authorities-on-maintaining-educational-provision)
+
+ ### Taking time off
+ If you cannot get childcare or need to take time off to care for other dependants you should be able to take unpaid leave. Find out more about time off to care for dependants on the [ACAS website](https://www.acas.org.uk/coronavirus/time-off-work-to-look-after-someone).
+ $CTA
+ <% end %>
+
+ <% if (
+ calculator.are_you_vulnerable == "no" &&
+ calculator.do_you_live_with_someone_vulnerable == "no" &&
+ calculator.have_childcare_responsibility == "no"
+ ) %>
+ $CTA
+ You can go back into work, but your employer must make arrangements for you to work safely.
+
+ Check the guidance on working safely, and what you will need to do.
+ $CTA
+ <% end %>
+
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.govspeak.erb
deleted file mode 100644
index 5eabaf4d312..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<% render_content_for :title do %>
- You can go back to work
-<% end %>
-
-<% render_content_for :body do %>
-
- <% if calculator.are_you_vulnerable == "yes" %>
- $CTA
- ## If you are clinically vulnerable: get your employer to make arrangements for you to work safely
-
- Clinically vulnerable people are at higher risk of severe illness (for example, people with pre-existing conditions). Therefore, you should take extra care in observing social distancing. Your employer should help you to work from home, either in your current role or in an alternative role.
-
- If you are clinically vulnerable (but not extremely clinically vulnerable) and cannot work from home, your employer should offer you the option of the safest available on-site roles, enabling you to stay 2 metres away from others.
-
- If you have to spend time within 2 metres of others, employers should carefully assess whether this involves an acceptable level of risk. As for any workplace risk, employers must take into account specific duties to those with protected characteristics, including, for example, pregnant women who are entitled to a suspension on full pay if suitable roles cannot be found.
-
- [Find out more about how to work safely in your workplace](/coronavirus-business-reopening)
- $CTA
- <% end %>
-
- <% if calculator.do_you_live_with_someone_vulnerable == "yes" %>
- $CTA
- ## If you live with someone extremely clinically vulnerable: get advice on how to socially distance at work and keep your household safe
-
- If you cannot work from home, you should make sure your employer is following guidance on [how to work safely during the coronavirus pandemic](/coronavirus-business-reopening).
-
- Employers should pay particular attention to people who live with clinically extremely vulnerable individuals.
-
- You and your household should follow the [guidance on how to protect clinically extremely vulnerable people](/government/publications/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19#living-with-other-people).
- $CTA
- <% end %>
-
- <% if calculator.have_childcare_responsibility == "yes" %>
- $CTA
- ## If you need help with childcare or dependants: Find out if you can send your children back to school or take time off
-
- ### Schools and childcare
- Schools in England may open for:
-
- - primary schools for children in reception, year 1 and year 6
- - nurseries and other early years settings, including childminders
- - children of key workers and vulnerable children
-
- [Find out if you are classed as a key worker, and if you can send your children back to school](/government/publications/coronavirus-covid-19-maintaining-educational-provision/guidance-for-schools-colleges-and-local-authorities-on-maintaining-educational-provision)
-
- ### Taking time off
- If you cannot get childcare or need to take time off to care for other dependants you should be able to take unpaid leave. Find out more about time off to care for dependants on the [ACAS website](https://www.acas.org.uk/coronavirus/time-off-work-to-look-after-someone).
- $CTA
- <% end %>
-
- <% if (
- calculator.are_you_vulnerable == "no" &&
- calculator.do_you_live_with_someone_vulnerable == "no" &&
- calculator.have_childcare_responsibility == "no"
- ) %>
- $CTA
- You can go back into work, but your employer must make arrangements for you to work safely.
-
- Check the guidance on working safely, and what you will need to do.
- $CTA
- <% end %>
-
- <%= render "come_back" %>
-<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.erb
new file mode 100644
index 00000000000..8320e1289a4
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.erb
@@ -0,0 +1,12 @@
+<% govspeak_for :body do %>
+ $CTA
+ ## You should work from home or get support if you cannot
+
+ You should work from home, and your employer is expected to help and support you.
+
+ If your job cannot be done from home, you should discuss options with your employer.
+
+ [Find out more about what your options are](https://www.gov.uk/government/publications/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19#work-and-employment-for-those-who-are-shielding).
+ $CTA
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.govspeak.erb
deleted file mode 100644
index 8cc7e542fd8..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/shielding_work_arrangements.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :body do %>
- $CTA
- ## You should work from home or get support if you cannot
-
- You should work from home, and your employer is expected to help and support you.
-
- If your job cannot be done from home, you should discuss options with your employer.
-
- [Find out more about what your options are](https://www.gov.uk/government/publications/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19/guidance-on-shielding-and-protecting-extremely-vulnerable-persons-from-covid-19#work-and-employment-for-those-who-are-shielding).
- $CTA
- <%= render "come_back" %>
-<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.erb
new file mode 100644
index 00000000000..5d8e5c49fcd
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.erb
@@ -0,0 +1,10 @@
+<% govspeak_for :body do %>
+ $CTA
+ ## Get permission and support for not working
+
+ Your rights to “shield” and the support you can get to not work, including sick leave pay, or UC?
+
+ Link to employee hub for additional support?
+ $CTA
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.govspeak.erb
deleted file mode 100644
index 49f9f90c4f3..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/support_for_not_working.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :body do %>
- $CTA
- ## Get permission and support for not working
-
- Your rights to “shield” and the support you can get to not work, including sick leave pay, or UC?
-
- Link to employee hub for additional support?
- $CTA
- <%= render "come_back" %>
-<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.erb
new file mode 100644
index 00000000000..7ef38297321
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ $CTA
+ ## You should work from home
+
+ Your employer should help you work from home by:
+
+ - discussing home working arrangements
+ - ensuring you have the right equipment, for example remote access to work systems
+ - including you in all necessary communications
+ - looking after your physical and mental wellbeing
+ $CTA
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.govspeak.erb
deleted file mode 100644
index 529baf45924..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- $CTA
- ## You should work from home
-
- Your employer should help you work from home by:
-
- - discussing home working arrangements
- - ensuring you have the right equipment, for example remote access to work systems
- - including you in all necessary communications
- - looking after your physical and mental wellbeing
- $CTA
- <%= render "come_back" %>
-<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.erb
new file mode 100644
index 00000000000..3e14ff5a372
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.erb
@@ -0,0 +1,16 @@
+<% govspeak_for :body do %>
+ $CTA
+ ## Get help to work from home
+ Your employer should help you work from home by:
+
+ - discussing home working arrangements
+ - making sure you’ve the right equipment, for example, remote access to work systems
+ - including you in all necessary communications
+ - looking after your physical and mental wellbeing
+
+ This will apply to many different types of businesses, particularly for employees who would have typically worked in offices or on-site.
+
+ If your employer is not taking all practical steps to promote social distancing, you can report this to your local authority, or the [Health and Safety Executive](https://www.hse.gov.uk/) who can take a range of actions, including requiring your employer to take additional steps where appropriate.
+ $CTA
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.govspeak.erb
deleted file mode 100644
index c4136118310..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/work_from_home_help.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :body do %>
- $CTA
- ## Get help to work from home
- Your employer should help you work from home by:
-
- - discussing home working arrangements
- - making sure you’ve the right equipment, for example, remote access to work systems
- - including you in all necessary communications
- - looking after your physical and mental wellbeing
-
- This will apply to many different types of businesses, particularly for employees who would have typically worked in offices or on-site.
-
- If your employer is not taking all practical steps to promote social distancing, you can report this to your local authority, or the [Health and Safety Executive](https://www.hse.gov.uk/) who can take a range of actions, including requiring your employer to take additional steps where appropriate.
- $CTA
- <%= render "come_back" %>
-<% 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
new file mode 100644
index 00000000000..7ac067bab8f
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ You should not be going to work
+<% end %>
+
+<% govspeak_for :body do %>
+ $CTA
+ ### If your employer has no work for you to do (you’ve been put 'on furlough')
+
+ Your employer might be able to keep you on the payroll if they’re unable to operate and put you on temporary leave instead. This is known as being put 'on furlough'.
+
+ Your employer could get a grant using the Coronavirus Job Retention Scheme to help them pay for some of your wages. [Check if your employer can use it](https://www.gov.uk/guidance/check-if-you-could-be-covered-by-the-coronavirus-job-retention-scheme).
+
+ If your salary is reduced because of these changes, [check if you’re eligible for Universal Credit](https://www.gov.uk/universal-credit/eligibility).
+ $CTA
+
+ <%= render "come_back" %>
+<% end %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.govspeak.erb
deleted file mode 100644
index ba12fb75b48..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- You should not be going to work
-<% end %>
-
-<% render_content_for :body do %>
- $CTA
- ### If your employer has no work for you to do (you’ve been put 'on furlough')
-
- Your employer might be able to keep you on the payroll if they’re unable to operate and put you on temporary leave instead. This is known as being put 'on furlough'.
-
- Your employer could get a grant using the Coronavirus Job Retention Scheme to help them pay for some of your wages. [Check if your employer can use it](https://www.gov.uk/guidance/check-if-you-could-be-covered-by-the-coronavirus-job-retention-scheme).
-
- If your salary is reduced because of these changes, [check if you’re eligible for Universal Credit](https://www.gov.uk/universal-credit/eligibility).
- $CTA
-
- <%= render "come_back" %>
-<% 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
new file mode 100644
index 00000000000..f9b820a2405
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Are you shielding at home because you are clinically extremely vulnerable?
+<% end %>
+
+<% govspeak_for :body do %>
+ You will have been told by your doctor if you are clinically extremely vulnerable.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.govspeak.erb
deleted file mode 100644
index a0001320bb6..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Are you shielding at home because you are clinically extremely vulnerable?
-<% end %>
-
-<% render_content_for :body do %>
- You will have been told by your doctor if you are clinically extremely vulnerable.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..d778c9cc311
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.erb
@@ -0,0 +1,27 @@
+<% text_for :title do %>
+ Are you clinically vulnerable?
+<% end %>
+
+<% govspeak_for :body do %>
+ You are clinically vulnerable if you are:
+
+ - aged 70 or older (regardless of medical condition)
+ - pregnant
+
+ If you are under 70, you are also clinically vulnerable if you have an underlying health condition listed below:
+
+ - chronic (long-term) mild to moderate respiratory diseases, such as asthma, chronic obstructive pulmonary disease (COPD), emphysema or bronchitis
+ - chronic heart disease, such as heart failure
+ - chronic kidney disease
+ - chronic liver disease, such as hepatitis
+ - chronic neurological conditions, such as Parkinson’s disease, motor neurone disease, multiple sclerosis (MS), or cerebral palsy
+ - diabetes
+ - a weakened immune system as the result of certain conditions, treatments like chemotherapy, or medicines such as steroid tablets
+ - seriously overweight (a body mass index (BMI) of 40 or above)
+
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.govspeak.erb
deleted file mode 100644
index dd694b2f265..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :title do %>
- Are you clinically vulnerable?
-<% end %>
-
-<% render_content_for :body do %>
- You are clinically vulnerable if you are:
-
- - aged 70 or older (regardless of medical condition)
- - pregnant
-
- If you are under 70, you are also clinically vulnerable if you have an underlying health condition listed below:
-
- - chronic (long-term) mild to moderate respiratory diseases, such as asthma, chronic obstructive pulmonary disease (COPD), emphysema or bronchitis
- - chronic heart disease, such as heart failure
- - chronic kidney disease
- - chronic liver disease, such as hepatitis
- - chronic neurological conditions, such as Parkinson’s disease, motor neurone disease, multiple sclerosis (MS), or cerebral palsy
- - diabetes
- - a weakened immune system as the result of certain conditions, treatments like chemotherapy, or medicines such as steroid tablets
- - seriously overweight (a body mass index (BMI) of 40 or above)
-
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..26d68b244d2
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Are you able to do your job from home?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "maybe": "Yes, but my employer has not made the appropriate arrangements",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.govspeak.erb
deleted file mode 100644
index fe0746f507e..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Are you able to do your job from home?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "maybe": "Yes, but my employer has not made the appropriate arrangements",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..248cbd94a96
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do you live with someone who is clinically extremely vulnerable?
+<% end %>
+
+<% govspeak_for :body do %>
+ They will have been told by their doctor if they are considered clinically extremely vulnerable.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.govspeak.erb
deleted file mode 100644
index dab1eba586c..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do you live with someone who is clinically extremely vulnerable?
-<% end %>
-
-<% render_content_for :body do %>
- They will have been told by their doctor if they are considered clinically extremely vulnerable.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..3b19a6014b4
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you have responsibilities for childcare or other dependents that make it difficult for you to go to work?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.govspeak.erb
deleted file mode 100644
index e65374fc308..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you have responsibilities for childcare or other dependents that make it difficult for you to go to work?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..65e48fecaac
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.erb
@@ -0,0 +1,14 @@
+<% govspeak_for :pretext do %>
+ ##Your workplace should be closed
+
+ 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 %>
+
+<% text_for :title do %>
+ Is your employer asking you to work or to start work from 4 July 2020?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.govspeak.erb
deleted file mode 100644
index 144503f5779..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :pretext do %>
- ##Your workplace should be closed
-
- 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 %>
- Is your employer asking you to work or to start work from 4 July 2020?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..d7481ab5f27
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Is your workplace a livestock auction house?
+<% end %>
+
+<% govspeak_for :pretext do %>
+ Your workplace should be closed unless you work at a livestock auction house.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No",
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.govspeak.erb
deleted file mode 100644
index 46ad4f6cecf..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Is your workplace a livestock auction house?
-<% end %>
-
-<% render_content_for :pretext do %>
- Your workplace should be closed unless you work at a livestock auction house.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No",
-) %>
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
new file mode 100644
index 00000000000..e350902a972
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.erb
@@ -0,0 +1,88 @@
+<%
+ workplace = calculator.where_do_you_work
+ case workplace
+ when "driving_schools", "museums_or_galleries", "cinema", "indoor_attraction", "retail"
+ options = {
+ "yes": "Yes",
+ "no": "No",
+ }
+ else
+ options = {
+ "yes": "Yes, I work at one of these exceptions",
+ "no": "No, I do not work at one of these exceptions",
+ }
+ end
+%>
+<% text_for :title do %>
+ <% case workplace %>
+ <% when "museums_or_galleries" %>
+ Is your place of work a retail gallery?
+ <% when "cinema" %>
+ Is your place of work a drive-in cinema?
+ <% when "indoor_attraction" %>
+ Is your workplace an outdoor area of a zoo, safari park, wildlife centre or other animal attraction?
+ <% when "retail" %>
+ Is your workplace inside another closed building?
+ <% else %>
+ Is your workplace one of these exceptions?
+ <% end %>
+<% end %>
+
+<% govspeak_for :pretext do %>
+ <% case workplace %>
+ <% when "holiday_accommodation" %>
+ ## Your workplace should be closed unless it’s providing accommodation to one of these exceptions:
+ <% when "museums_or_galleries" %>
+ Your workplace should be closed unless it’s a retail gallery where the majority of art on display is for sale.
+ <% when "cinema" %>
+ Your workplace should be closed unless it’s a drive-in cinema.
+ <% when "indoor_attraction" %>
+ Your workplace should be closed unless it’s an outdoor area of zoos, safari parks, wildlife centres and other animal attractions.
+ <% when "retail" %>
+ Your workplace can be open unless it is inside another building that is closed (for example, a gift shop inside a museum that is closed and customers cannot access it from outside).
+ <% else %>
+ ## Your workplace should be closed unless it’s one of these exceptions:
+ <% end %>
+
+ <% case workplace %>
+ <% when "driving_schools" %>
+ - driving schools or instructors providing lessions to key workers preparing for an emergency driving test
+ - test centres running emergency driving tests for key workers
+ <% when "food_and_drink" %>
+ - food delivery and takeaway - this can be a new activity; this covers the provision of hot and cold food that’s been prepared for consumers for collection or delivery to be consumed, reheated or cooked off the premises
+ - room services in hotels and accommodation
+ - cafés and canteens at places of work where there is no practical alternative (for example, hospitals, police stations, fire stations, care homes, schools, prisons and military)
+ - services providing food or drink to the homeless
+ <% when "holiday_accommodation" %>
+ - if people use these holiday accommodations or caravan parks as a permanent residence, or a temporary residence while their primary residence is unavailable
+ - non-UK residents who cannot travel to their country of residence during this period can continue to stay in hotels or similar accommodations
+ - hotels and other accommodations listed providing services necessary to any critical worker engaged in the efforts to deal with coronavirus
+ - hotels, hostels, and B&Bs providing rooms to support homeless and other vulnerable people through arrangements with local authorities and other public bodies (for example, those who cannot safely stay in their homes)
+ - hotels open to people attending a funeral where returning home would be impractical
+ - hotels and other accommodation hosting blood donation sessions
+ <% when "libraries" %>
+ - libraries operating click and collect services where orders are taken electronically, by telephone or by post
+ - shops and cafes or restaurants (takeaway only) which are in self-contained units where it’s possible for members of the public to enter from a place outside those premises
+ <% when "community_centre" %>
+ - community centres open for hosting essential voluntary activities and urgent public services, such as food banks and homeless services
+ - community centres open temporary to host a blood donation session
+ - community centres providing early years childcare by a person registered on the Early Years Register
+ - community centres hosting an indoor market
+ <% when "places_of_worship" %>
+ - burial grounds and cemeteries, as well as grounds surrounding crematoria and gardens of remembrance
+ - providers of funeral services, such as funeral directors and funeral homes
+ - a place of worship broadcasting an act of worship, whether over the internet or otherwise
+ - a place of worship open for the purpose of hosting essential voluntary activities and urgent public services, such as food banks, homeless services, and blood donation sessions
+ - a place of worship providing early years childcare by a person registered on the Early Years Register
+ - a place of worship open for private prayer by individuals (group prayers or communal worship within a place of worship - even between members of the same household - is not permitted)
+ - shops and cafes or restaurants (takeaway only) at places of worship which are in self-contained units where it’s possible for members of the public to enter from a place outside those premises
+ <% when "leisure_centre" %>
+ - a suitable assembly or leisure premise open for blood donation sessions
+ - open for training for elite athletes only (see [guidance for elite sport](https://www.gov.uk/government/publications/coronavirus-covid-19-guidance-on-phased-return-of-sport-and-recreation/elite-sport-return-to-training-guidance-step-one--2))
+ <% when "outdoor_recreation" %>
+ - outdoor sports courts or amenities, including public and private outdoor enclosed areas such as tennis courts, golf courses and driving ranges, basketball courts, bowling greens, football pitches, water sports, stables, shooting and archery venues outdoor swimming pools open for training for elite athletes only (see [guidance for elite sport](https://www.gov.uk/government/publications/coronavirus-covid-19-guidance-on-phased-return-of-sport-and-recreation/elite-sport-return-to-training-guidance-step-one--2))
+ - parks, open countryside, beaches and waterways (including private/ticketed gardens, such as those managed by the National Trust)
+ <% end %>
+<% end %>
+
+<% options(options) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.govspeak.erb
deleted file mode 100644
index ab56f115da1..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.govspeak.erb
+++ /dev/null
@@ -1,88 +0,0 @@
-<%
- workplace = calculator.where_do_you_work
- case workplace
- when "driving_schools", "museums_or_galleries", "cinema", "indoor_attraction", "retail"
- options = {
- "yes": "Yes",
- "no": "No",
- }
- else
- options = {
- "yes": "Yes, I work at one of these exceptions",
- "no": "No, I do not work at one of these exceptions",
- }
- end
-%>
-<% render_content_for :title do %>
- <% case workplace %>
- <% when "museums_or_galleries" %>
- Is your place of work a retail gallery?
- <% when "cinema" %>
- Is your place of work a drive-in cinema?
- <% when "indoor_attraction" %>
- Is your workplace an outdoor area of a zoo, safari park, wildlife centre or other animal attraction?
- <% when "retail" %>
- Is your workplace inside another closed building?
- <% else %>
- Is your workplace one of these exceptions?
- <% end %>
-<% end %>
-
-<% render_content_for :pretext do %>
- <% case workplace %>
- <% when "holiday_accommodation" %>
- ## Your workplace should be closed unless it’s providing accommodation to one of these exceptions:
- <% when "museums_or_galleries" %>
- Your workplace should be closed unless it’s a retail gallery where the majority of art on display is for sale.
- <% when "cinema" %>
- Your workplace should be closed unless it’s a drive-in cinema.
- <% when "indoor_attraction" %>
- Your workplace should be closed unless it’s an outdoor area of zoos, safari parks, wildlife centres and other animal attractions.
- <% when "retail" %>
- Your workplace can be open unless it is inside another building that is closed (for example, a gift shop inside a museum that is closed and customers cannot access it from outside).
- <% else %>
- ## Your workplace should be closed unless it’s one of these exceptions:
- <% end %>
-
- <% case workplace %>
- <% when "driving_schools" %>
- - driving schools or instructors providing lessions to key workers preparing for an emergency driving test
- - test centres running emergency driving tests for key workers
- <% when "food_and_drink" %>
- - food delivery and takeaway - this can be a new activity; this covers the provision of hot and cold food that’s been prepared for consumers for collection or delivery to be consumed, reheated or cooked off the premises
- - room services in hotels and accommodation
- - cafés and canteens at places of work where there is no practical alternative (for example, hospitals, police stations, fire stations, care homes, schools, prisons and military)
- - services providing food or drink to the homeless
- <% when "holiday_accommodation" %>
- - if people use these holiday accommodations or caravan parks as a permanent residence, or a temporary residence while their primary residence is unavailable
- - non-UK residents who cannot travel to their country of residence during this period can continue to stay in hotels or similar accommodations
- - hotels and other accommodations listed providing services necessary to any critical worker engaged in the efforts to deal with coronavirus
- - hotels, hostels, and B&Bs providing rooms to support homeless and other vulnerable people through arrangements with local authorities and other public bodies (for example, those who cannot safely stay in their homes)
- - hotels open to people attending a funeral where returning home would be impractical
- - hotels and other accommodation hosting blood donation sessions
- <% when "libraries" %>
- - libraries operating click and collect services where orders are taken electronically, by telephone or by post
- - shops and cafes or restaurants (takeaway only) which are in self-contained units where it’s possible for members of the public to enter from a place outside those premises
- <% when "community_centre" %>
- - community centres open for hosting essential voluntary activities and urgent public services, such as food banks and homeless services
- - community centres open temporary to host a blood donation session
- - community centres providing early years childcare by a person registered on the Early Years Register
- - community centres hosting an indoor market
- <% when "places_of_worship" %>
- - burial grounds and cemeteries, as well as grounds surrounding crematoria and gardens of remembrance
- - providers of funeral services, such as funeral directors and funeral homes
- - a place of worship broadcasting an act of worship, whether over the internet or otherwise
- - a place of worship open for the purpose of hosting essential voluntary activities and urgent public services, such as food banks, homeless services, and blood donation sessions
- - a place of worship providing early years childcare by a person registered on the Early Years Register
- - a place of worship open for private prayer by individuals (group prayers or communal worship within a place of worship - even between members of the same household - is not permitted)
- - shops and cafes or restaurants (takeaway only) at places of worship which are in self-contained units where it’s possible for members of the public to enter from a place outside those premises
- <% when "leisure_centre" %>
- - a suitable assembly or leisure premise open for blood donation sessions
- - open for training for elite athletes only (see [guidance for elite sport](https://www.gov.uk/government/publications/coronavirus-covid-19-guidance-on-phased-return-of-sport-and-recreation/elite-sport-return-to-training-guidance-step-one--2))
- <% when "outdoor_recreation" %>
- - outdoor sports courts or amenities, including public and private outdoor enclosed areas such as tennis courts, golf courses and driving ranges, basketball courts, bowling greens, football pitches, water sports, stables, shooting and archery venues outdoor swimming pools open for training for elite athletes only (see [guidance for elite sport](https://www.gov.uk/government/publications/coronavirus-covid-19-guidance-on-phased-return-of-sport-and-recreation/elite-sport-return-to-training-guidance-step-one--2))
- - parks, open countryside, beaches and waterways (including private/ticketed gardens, such as those managed by the National Trust)
- <% end %>
-<% end %>
-
-<% options(options) %>
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
new file mode 100644
index 00000000000..0b9e0bf95ed
--- /dev/null
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.erb
@@ -0,0 +1,25 @@
+<% text_for :title do %>
+ Where do you work?
+<% end %>
+
+<% options(
+ "food_and_drink": "Restaurant, pub, wine bar, café or canteen, or other food and drink establishment",
+ "salon_parlour": "Hairdressers, barbers, beauty or nail salon, piercing and tattoo parlour, spa or massage parlour",
+ "retail": "Retail",
+ "auction_house": "Auction houses",
+ "holiday_accommodation": "Holiday accommodation or caravan parks",
+ "driving_schools": "Driving schools, test centres, and driving instructors",
+ "libraries": "Libraries",
+ "community_centre": "Community centres",
+ "places_of_worship": "Places of worship",
+ "museums_or_galleries": "Museums or galleries",
+ "nightclubs_or_gambling": "Nightclubs, bingo halls or casinos",
+ "cinema": "Cinema, theatre or concert hall",
+ "leisure_centre": "Indoor fitness studios, gyms, swimming pools or other indoor leisure centres",
+ "indoor_attraction": "Indoor attractions at aquariums, zoos, safari parks, wildlife centres visitor farms and other animal attractions",
+ "indoor_visitor_centres": "Indoor attractions and visitor centres at botanical or other gardens, heritage sites, landmarks, film studios or similar",
+ "indoor_recreation": "Indoor arcade, bowling alley, soft play centre or similar facility",
+ "funfair": "Funfairs, skating rinks or adventure parks",
+ "outdoor_recreation": "Playgrounds, outdoor gyms or outdoor swimming pools, model villages",
+ "other": "None of these"
+) %>
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.govspeak.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.govspeak.erb
deleted file mode 100644
index 612cc4e3aa6..00000000000
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.govspeak.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% render_content_for :title do %>
- Where do you work?
-<% end %>
-
-<% options(
- "food_and_drink": "Restaurant, pub, wine bar, café or canteen, or other food and drink establishment",
- "salon_parlour": "Hairdressers, barbers, beauty or nail salon, piercing and tattoo parlour, spa or massage parlour",
- "retail": "Retail",
- "auction_house": "Auction houses",
- "holiday_accommodation": "Holiday accommodation or caravan parks",
- "driving_schools": "Driving schools, test centres, and driving instructors",
- "libraries": "Libraries",
- "community_centre": "Community centres",
- "places_of_worship": "Places of worship",
- "museums_or_galleries": "Museums or galleries",
- "nightclubs_or_gambling": "Nightclubs, bingo halls or casinos",
- "cinema": "Cinema, theatre or concert hall",
- "leisure_centre": "Indoor fitness studios, gyms, swimming pools or other indoor leisure centres",
- "indoor_attraction": "Indoor attractions at aquariums, zoos, safari parks, wildlife centres visitor farms and other animal attractions",
- "indoor_visitor_centres": "Indoor attractions and visitor centres at botanical or other gardens, heritage sites, landmarks, film studios or similar",
- "indoor_recreation": "Indoor arcade, bowling alley, soft play centre or similar facility",
- "funfair": "Funfairs, skating rinks or adventure parks",
- "outdoor_recreation": "Playgrounds, outdoor gyms or outdoor swimming pools, model villages",
- "other": "None of these"
-) %>
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
new file mode 100644
index 00000000000..48543333f34
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.erb
@@ -0,0 +1,26 @@
+<% text_for :title do %>
+ Estimate your penalty for late Self Assessment tax returns and payments
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Get an estimate of how much you’ll need to pay in penalties and interest if you’ve missed the deadline for:
+
+ - sending your Self Assessment tax return
+ - paying your Self Assessment tax bill
+
+ This calculator can only give an estimate of what you owe and does not take account of:
+
+ - payments you’ve made towards your tax bill
+ - outstanding interest or penalties for previous tax years
+ - credit you have from previous tax years
+
+ Do not use the calculator if you:
+
+ - got your request to fill in a Self Assessment less than 3 months before the deadline, so had more time to file it
+ - sent a paper return after October 31, but HMRC agreed you had a reasonable excuse to not file online
+
+<% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.govspeak.erb
deleted file mode 100644
index 63d8f1031ac..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.govspeak.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% render_content_for :title do %>
- Estimate your penalty for late Self Assessment tax returns and payments
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Get an estimate of how much you’ll need to pay in penalties and interest if you’ve missed the deadline for:
-
- - sending your Self Assessment tax return
- - paying your Self Assessment tax bill
-
- This calculator can only give an estimate of what you owe and does not take account of:
-
- - payments you’ve made towards your tax bill
- - outstanding interest or penalties for previous tax years
- - credit you have from previous tax years
-
- Do not use the calculator if you:
-
- - got your request to fill in a Self Assessment less than 3 months before the deadline, so had more time to file it
- - sent a paper return after October 31, but HMRC agreed you had a reasonable excuse to not file online
-
-<% 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
new file mode 100644
index 00000000000..cc78a17582f
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ You don't have to pay a penalty
+<% end %>
+
+<% govspeak_for :body do %>
+ You sent your tax return on or before the deadline, so you don’t have to pay a penalty.
+
+ You paid your bill on time, so there is no interest or penalty for late payment.
+<% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.govspeak.erb
deleted file mode 100644
index 7fae87861e5..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- You don't have to pay a penalty
-<% end %>
-
-<% render_content_for :body do %>
- You sent your tax return on or before the deadline, so you don’t have to pay a penalty.
-
- You paid your bill on time, so there is no interest or penalty for late payment.
-<% 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
new file mode 100644
index 00000000000..0b910332051
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.erb
@@ -0,0 +1,28 @@
+<% text_for :title do %>
+ You paid tax or sent your return late
+<% end %>
+
+<% govspeak_for :body do %>
+ | Key facts | Your results |
+ |-----------|--------------|
+ | Your penalty for sending the return late | <%= calculator.late_filing_penalty == 0 ? 'none' : format_money(calculator.late_filing_penalty) %> |
+ <% if calculator.late_payment_penalty == 0 %>
+ | What you said your tax bill was | <%= format_money(calculator.estimated_bill) %> |
+ | Interest added for paying your bill late | <%= calculator.interest == 0 ? 0 : format_money(calculator.interest) %> |
+ | Penalty for paying your bill late | none |
+ | Estimate of the total you owe | <%= format_money(calculator.total_owed_plus_filing_penalty) %> |
+ <% else %>
+ | What you said your tax bill was | <%= format_money(calculator.estimated_bill) %> |
+ | Interest added for paying your bill late | <%= calculator.interest == 0 ? 0 : format_money(calculator.interest) %> |
+ | Penalty for paying your bill late | <%= format_money(calculator.late_payment_penalty) %> |
+ | Estimate of the total you owe | <%= format_money(calculator.total_owed_plus_filing_penalty) %> |
+ <% end %>
+
+ <% if calculator.payment_date >= calculator.one_year_after_start_date_for_penalties %>
+ Your penalty can be up to 100% of your tax bill if you deliberately don’t pay it.
+ <% end %>
+
+ These figures are estimates based on the figures you gave. The total is rounded down to the nearest pound.
+
+ ^You don’t have to pay any penalties unless you're asked to by HMRC. The amount that HMRC asks for might be different than this estimate.^
+<% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.govspeak.erb
deleted file mode 100644
index 982ebd2764d..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :title do %>
- You paid tax or sent your return late
-<% end %>
-
-<% render_content_for :body do %>
- | Key facts | Your results |
- |-----------|--------------|
- | Your penalty for sending the return late | <%= calculator.late_filing_penalty == 0 ? 'none' : format_money(calculator.late_filing_penalty) %> |
- <% if calculator.late_payment_penalty == 0 %>
- | What you said your tax bill was | <%= format_money(calculator.estimated_bill) %> |
- | Interest added for paying your bill late | <%= calculator.interest == 0 ? 0 : format_money(calculator.interest) %> |
- | Penalty for paying your bill late | none |
- | Estimate of the total you owe | <%= format_money(calculator.total_owed_plus_filing_penalty) %> |
- <% else %>
- | What you said your tax bill was | <%= format_money(calculator.estimated_bill) %> |
- | Interest added for paying your bill late | <%= calculator.interest == 0 ? 0 : format_money(calculator.interest) %> |
- | Penalty for paying your bill late | <%= format_money(calculator.late_payment_penalty) %> |
- | Estimate of the total you owe | <%= format_money(calculator.total_owed_plus_filing_penalty) %> |
- <% end %>
-
- <% if calculator.payment_date >= calculator.one_year_after_start_date_for_penalties %>
- Your penalty can be up to 100% of your tax bill if you deliberately don’t pay it.
- <% end %>
-
- These figures are estimates based on the figures you gave. The total is rounded down to the nearest pound.
-
- ^You don’t have to pay any penalties unless you're asked to by HMRC. The amount that HMRC asks for might be different than this estimate.^
-<% 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
new file mode 100644
index 00000000000..8e76de63fbf
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ How much was your tax bill?
+<% end %>
+
+<% text_for :hint do %>
+ Enter an estimate if you don't know the exact amount.
+<% end %>
+
+<% govspeak_for :post_body do %>
+ Your details won't be passed to HMRC.
+<% end %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.govspeak.erb
deleted file mode 100644
index 183b60baedc..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- How much was your tax bill?
-<% end %>
-
-<% render_content_for :hint do %>
- Enter an estimate if you don't know the exact amount.
-<% end %>
-
-<% render_content_for :post_body do %>
- Your details won't be passed to HMRC.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..3f2a4da19be
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How did you send your Self Assessment tax return?
+<% end %>
+
+<% options(
+ "online": "Online",
+ "paper": "On paper"
+) %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.govspeak.erb
deleted file mode 100644
index 219f3ce1381..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How did you send your Self Assessment tax return?
-<% end %>
-
-<% options(
- "online": "Online",
- "paper": "On paper"
-) %>
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
new file mode 100644
index 00000000000..41e002ffed5
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When did you pay the bill?
+<% end %>
+
+<% text_for :hint do %>
+ If you haven’t paid yet, enter the date you expect HM Revenue & Customs to get your payment
+<% end %>
+
+<% 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_paid.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.govspeak.erb
deleted file mode 100644
index fbe4ea37365..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When did you pay the bill?
-<% end %>
-
-<% render_content_for :hint do %>
- If you haven’t paid yet, enter the date you expect HM Revenue & Customs to get your payment
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..2cb5bfb3240
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When did you send your Self Assessment tax return?
+<% end %>
+
+<% 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 %>
+
+<% 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/when_submitted.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.govspeak.erb
deleted file mode 100644
index 898a9e7c663..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When did you send your Self Assessment tax return?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..159cf1dda7a
--- /dev/null
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ For which tax year do you want the estimate?
+<% end %>
+
+<% options(
+ "2012-13": "6 April 2012 to 5 April 2013",
+ "2013-14": "6 April 2013 to 5 April 2014",
+ "2014-15": "6 April 2014 to 5 April 2015",
+ "2015-16": "6 April 2015 to 5 April 2016",
+ "2016-17": "6 April 2016 to 5 April 2017",
+ "2017-18": "6 April 2017 to 5 April 2018",
+ "2018-19": "6 April 2018 to 5 April 2019",
+) %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.govspeak.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.govspeak.erb
deleted file mode 100644
index c4808a58d0a..00000000000
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- For which tax year do you want the estimate?
-<% end %>
-
-<% options(
- "2012-13": "6 April 2012 to 5 April 2013",
- "2013-14": "6 April 2013 to 5 April 2014",
- "2014-15": "6 April 2014 to 5 April 2015",
- "2015-16": "6 April 2015 to 5 April 2016",
- "2016-17": "6 April 2016 to 5 April 2017",
- "2017-18": "6 April 2017 to 5 April 2018",
- "2018-19": "6 April 2018 to 5 April 2019",
-) %>
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
new file mode 100644
index 00000000000..5f1ef46cf07
--- /dev/null
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Help if you're arrested abroad
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Find out what help you can get if you or someone you know is arrested abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.govspeak.erb
deleted file mode 100644
index 801b4aac89d..00000000000
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Help if you're arrested abroad
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Find out what help you can get if you or someone you know is arrested abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_common_downloads.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_common_downloads.erb
similarity index 100%
rename from lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_common_downloads.govspeak.erb
rename to lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_common_downloads.erb
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_further_links.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_further_links.erb
similarity index 100%
rename from lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_further_links.govspeak.erb
rename to lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_further_links.erb
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_iran_downloads.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_iran_downloads.erb
similarity index 100%
rename from lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_iran_downloads.govspeak.erb
rename to lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/_iran_downloads.erb
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
new file mode 100644
index 00000000000..457b41104ab
--- /dev/null
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.erb
@@ -0,0 +1,79 @@
+<% text_for :title do %>
+ Help for British nationals arrested abroad
+<% end %>
+
+<% govspeak_for :body do %>
+ $!
+ The Foreign & Commonwealth Office (FCO) or the nearest British embassy, high commission or consulate can give advice on local laws and procedures, contact friends and provide a list of lawyers and translators.
+ $!
+
+ %The person arrested or detained should contact the nearest British embassy, high commission or consulate as soon as possible - the police might also do this on their behalf.%
+
+ The British embassy, high commission or consulate will aim to contact the arrested person as soon as possible after being told about their arrest or detention. The consulate will then aim to provide assistance according to the individual circumstances and local conditions.
+
+ The British consulate will also arrange for friends and family to be told:
+
+ - the person’s been arrested
+ - details of the arrest
+ - contact details for the arrested person
+
+ ^The FCO can only give out this information if the arrested person has given their permission.^
+
+ ##Help available
+
+ The FCO and British consulate can offer help to arrested persons or prisoners. This includes:
+
+ - providing general information about the country, prison conditions and the local legal system (including if legal aid is available)
+ - providing a list of local lawyers and interpreters
+ - telling the police or prison doctor about any medical or dental problems with the arrested person’s permission
+ - helping with complaints about the police or prison (eg, ill treatment, personal safety, discrimination) with the arrested person or prisoner’s permission
+ - sending money to the arrested person from their family
+ - sending messages between the arrested person and their family
+ - putting the prisoners in touch with the charity [Prisoners Abroad](http://www.prisonersabroad.org.uk "Prisoners Abroad"){:rel="external"}
+ - helping British prisoners apply for a transfer to UK where possible
+ - visiting prisoners when needed
+
+ <% if has_extra_downloads %>
+ ##Download prisoner packs and other helpful information
+
+ The FCO has produced guides explaining the legal and prison system in different countries for British nationals arrested abroad.
+
+ <%= pdf %>
+ <%= doc %>
+ <%= benefits %>
+ <%= judicial %>
+ <%= prison %>
+ <%= police %>
+ <%= consul %>
+ <%= lawyer %>
+
+ <%= region_downloads %>
+ <% end %>
+
+ <% if iran %>
+ <%= render partial: 'iran_downloads', locals: { transfer_back: transfers_back_to_uk_treaty_change_countries.exclude?(country) } %>
+ <% else %>
+ <%= render partial: 'common_downloads', locals: { transfer_back: transfers_back_to_uk_treaty_change_countries.exclude?(country) } %>
+ <% end %>
+
+ ##What the FCO and British consulate can’t do
+
+ The FCO and British consulate won’t be able to:
+
+ - get someone out of prison or detention
+ - help someone get special treatment
+ - offer legal advice, start legal proceedings or investigate a crime
+ - pay for any costs as a result of being arrested
+ - forward packages sent by friends or family to an arrested person or prisoner
+ - prevent authorities from deporting a British national after release
+
+ ##Dual nationals
+
+ The FCO and British consulate can help a dual British national (with a valid British passport) as long as they’re arrested in a country other than the one they hold dual nationality with.
+
+ They won’t get involved if someone’s arrested in a country for which they hold a valid passport, unless there’s a special humanitarian reason to do so.
+
+ ##Other organisations that can help
+
+ <%= render partial: 'further_links' %>
+<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.govspeak.erb
deleted file mode 100644
index 43cf601cb44..00000000000
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.govspeak.erb
+++ /dev/null
@@ -1,79 +0,0 @@
-<% render_content_for :title do %>
- Help for British nationals arrested abroad
-<% end %>
-
-<% render_content_for :body do %>
- $!
- The Foreign & Commonwealth Office (FCO) or the nearest British embassy, high commission or consulate can give advice on local laws and procedures, contact friends and provide a list of lawyers and translators.
- $!
-
- %The person arrested or detained should contact the nearest British embassy, high commission or consulate as soon as possible - the police might also do this on their behalf.%
-
- The British embassy, high commission or consulate will aim to contact the arrested person as soon as possible after being told about their arrest or detention. The consulate will then aim to provide assistance according to the individual circumstances and local conditions.
-
- The British consulate will also arrange for friends and family to be told:
-
- - the person’s been arrested
- - details of the arrest
- - contact details for the arrested person
-
- ^The FCO can only give out this information if the arrested person has given their permission.^
-
- ##Help available
-
- The FCO and British consulate can offer help to arrested persons or prisoners. This includes:
-
- - providing general information about the country, prison conditions and the local legal system (including if legal aid is available)
- - providing a list of local lawyers and interpreters
- - telling the police or prison doctor about any medical or dental problems with the arrested person’s permission
- - helping with complaints about the police or prison (eg, ill treatment, personal safety, discrimination) with the arrested person or prisoner’s permission
- - sending money to the arrested person from their family
- - sending messages between the arrested person and their family
- - putting the prisoners in touch with the charity [Prisoners Abroad](http://www.prisonersabroad.org.uk "Prisoners Abroad"){:rel="external"}
- - helping British prisoners apply for a transfer to UK where possible
- - visiting prisoners when needed
-
- <% if has_extra_downloads %>
- ##Download prisoner packs and other helpful information
-
- The FCO has produced guides explaining the legal and prison system in different countries for British nationals arrested abroad.
-
- <%= pdf %>
- <%= doc %>
- <%= benefits %>
- <%= judicial %>
- <%= prison %>
- <%= police %>
- <%= consul %>
- <%= lawyer %>
-
- <%= region_downloads %>
- <% end %>
-
- <% if iran %>
- <%= render partial: 'iran_downloads.govspeak.erb', locals: { transfer_back: transfers_back_to_uk_treaty_change_countries.exclude?(country) } %>
- <% else %>
- <%= render partial: 'common_downloads.govspeak.erb', locals: { transfer_back: transfers_back_to_uk_treaty_change_countries.exclude?(country) } %>
- <% end %>
-
- ##What the FCO and British consulate can’t do
-
- The FCO and British consulate won’t be able to:
-
- - get someone out of prison or detention
- - help someone get special treatment
- - offer legal advice, start legal proceedings or investigate a crime
- - pay for any costs as a result of being arrested
- - forward packages sent by friends or family to an arrested person or prisoner
- - prevent authorities from deporting a British national after release
-
- ##Dual nationals
-
- The FCO and British consulate can help a dual British national (with a valid British passport) as long as they’re arrested in a country other than the one they hold dual nationality with.
-
- They won’t get involved if someone’s arrested in a country for which they hold a valid passport, unless there’s a special humanitarian reason to do so.
-
- ##Other organisations that can help
-
- <%= render partial: 'further_links.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..6cc479e21d0
--- /dev/null
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.erb
@@ -0,0 +1,23 @@
+<% text_for :title do %>
+ Help for British nationals arrested abroad
+<% end %>
+
+<% govspeak_for :body do %>
+
+%The Foreign and Commonwealth Office (FCO) does not provide consular assistance in the British Overseas Territories. All visitors, including British nationals visiting or resident in the territory, should look to the local authorities for assistance.%
+
+In emergency you can also call:
+
+$C
+
+The Foreign and Commonwealth Office in London
+
++44 (0)20 7008 1500
+
+$C
+
+<%= render partial: 'common_downloads', locals: { transfer_back: false } %>
+
+<%= render partial: 'further_links' %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.govspeak.erb
deleted file mode 100644
index 578e29e0e8d..00000000000
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.govspeak.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% render_content_for :title do %>
- Help for British nationals arrested abroad
-<% end %>
-
-<% render_content_for :body do %>
-
-%The Foreign and Commonwealth Office (FCO) does not provide consular assistance in the British Overseas Territories. All visitors, including British nationals visiting or resident in the territory, should look to the local authorities for assistance.%
-
-In emergency you can also call:
-
-$C
-
-The Foreign and Commonwealth Office in London
-
-+44 (0)20 7008 1500
-
-$C
-
-<%= render partial: 'common_downloads.govspeak.erb', locals: { transfer_back: false } %>
-
-<%= render partial: 'further_links.govspeak.erb' %>
-
-<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.erb
new file mode 100644
index 00000000000..768e2e4d1db
--- /dev/null
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.erb
@@ -0,0 +1,16 @@
+<% govspeak_for :body do %>
+ %There are no British consular services in Syria. British nationals who need help should contact an embassy from any EU state in Damascus.%
+
+ In emergency you can also call:
+
+
+ $C
+ The Foreign and Commonwealth Office in London
+ +44 (0)20 7008 1500
+ $C
+
+
+ <%= render partial: 'common_downloads', locals: { transfer_back: false } %>
+
+ <%= render partial: 'further_links' %>
+<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.govspeak.erb
deleted file mode 100644
index 9687093405b..00000000000
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_syria.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :body do %>
- %There are no British consular services in Syria. British nationals who need help should contact an embassy from any EU state in Damascus.%
-
- In emergency you can also call:
-
-
- $C
- The Foreign and Commonwealth Office in London
- +44 (0)20 7008 1500
- $C
-
-
- <%= render partial: 'common_downloads.govspeak.erb', locals: { transfer_back: false } %>
-
- <%= render partial: 'further_links.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..18119a109e9
--- /dev/null
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Which country?
+<% end %>
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.govspeak.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.govspeak.erb
deleted file mode 100644
index f3979de914b..00000000000
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..d29c055e3ed
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Intestacy - who inherits if someone dies without a will?
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Find out who is entitled to a share of someone’s money, property and possessions if they die without making a will.
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.govspeak.erb
deleted file mode 100644
index 7b50e5ec5f4..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Intestacy - who inherits if someone dies without a will?
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Find out who is entitled to a share of someone’s money, property and possessions if they die without making a will.
-<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/_next_step_links.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/_next_step_links.erb
similarity index 100%
rename from lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/_next_step_links.govspeak.erb
rename to lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/_next_step_links.erb
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
new file mode 100644
index 00000000000..550e5d3807b
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ The husband, wife or civil partner gets all of the estate.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.govspeak.erb
deleted file mode 100644
index ed7007a5888..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- The husband, wife or civil partner gets all of the estate.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..206743c8e1d
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the children or their descendants.
+<% end %>
+
+<% govspeak_for :body do %>
+ If a son or daughter has already died, their children (the grandchildren of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.govspeak.erb
deleted file mode 100644
index 883cc5dce60..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the children or their descendants.
-<% end %>
-
-<% render_content_for :body do %>
- If a son or daughter has already died, their children (the grandchildren of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..c0e13b8a687
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.erb
@@ -0,0 +1,16 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ The remainder of the estate will be shared as follows:
+
+ * the husband, wife or civil partner gets an absolute interest in half of the remainder
+ * the other half is then divided equally between the surviving children
+
+ If a son or daughter (or other child where the deceased had a parental role) has already died, their children will inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.govspeak.erb
deleted file mode 100644
index f6524c817cb..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- The remainder of the estate will be shared as follows:
-
- * the husband, wife or civil partner gets an absolute interest in half of the remainder
- * the other half is then divided equally between the surviving children
-
- If a son or daughter (or other child where the deceased had a parental role) has already died, their children will inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..f0f1e62e83a
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the half-brothers or half-sisters.
+<% end %>
+
+<% govspeak_for :body do %>
+ If a half-brother or half-sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.govspeak.erb
deleted file mode 100644
index 4c11c280780..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the half-brothers or half-sisters.
-<% end %>
-
-<% render_content_for :body do %>
- If a half-brother or half-sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..e8c84df7145
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the half-aunts or half-uncles.
+<% end %>
+
+<% govspeak_for :body do %>
+ If an aunt or uncle has already died, their children (the cousins of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.govspeak.erb
deleted file mode 100644
index d409da4cf48..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the half-aunts or half-uncles.
-<% end %>
-
-<% render_content_for :body do %>
- If an aunt or uncle has already died, their children (the cousins of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..47494e28b16
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ The whole estate goes to the Crown.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.govspeak.erb
deleted file mode 100644
index e2a0a985ab2..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- The whole estate goes to the Crown.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..ce8405b2339
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the parents.
+<% end %>
+
+<% govspeak_for :body do %>
+ They may have to pay Inheritance Tax.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.govspeak.erb
deleted file mode 100644
index 8b6ef1aaab2..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the parents.
-<% end %>
-
-<% render_content_for :body do %>
- They may have to pay Inheritance Tax.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..ae8bfe86b52
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the brothers or sisters.
+<% end %>
+
+<% govspeak_for :body do %>
+ If a brother or sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.govspeak.erb
deleted file mode 100644
index ff857b350f1..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the brothers or sisters.
-<% end %>
-
-<% render_content_for :body do %>
- If a brother or sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..ba4aea7db00
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.erb
@@ -0,0 +1,19 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ They also get:
+
+ - furniture and moveable household goods up to the value of £29,000
+ - up to £50,000 in cash
+ - a third of the rest of the estate
+
+ The children will get two-thirds of the rest of the estate.
+
+ If a son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.govspeak.erb
deleted file mode 100644
index 624ed2ab550..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- They also get:
-
- - furniture and moveable household goods up to the value of £29,000
- - up to £50,000 in cash
- - a third of the rest of the estate
-
- The children will get two-thirds of the rest of the estate.
-
- If a son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..5417aeec574
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.erb
@@ -0,0 +1,19 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ They also get:
+
+ - furniture and moveable household goods up to the value of £29,000
+ - up to £50,000 in cash
+ - a third of the rest of the estate
+
+ The rest of the estate goes to the brothers and sisters.
+
+ If a brother or sister has already died, their children (nieces or nephews of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.govspeak.erb
deleted file mode 100644
index cb662a459b1..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- They also get:
-
- - furniture and moveable household goods up to the value of £29,000
- - up to £50,000 in cash
- - a third of the rest of the estate
-
- The rest of the estate goes to the brothers and sisters.
-
- If a brother or sister has already died, their children (nieces or nephews of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..426086a871c
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ The husband, wife or civil partner gets the house up to a value of £473,000.
+<% end %>
+
+<% govspeak_for :body do %>
+ They also get:
+
+ - furniture and moveable household goods up to the value of £29,000
+ - £50,000 in cash
+ - a third of the rest of the estate
+
+ (If the cash left is less than £50,000, they will get all of the money.)
+
+ The rest of the estate goes to the parent or parents.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.govspeak.erb
deleted file mode 100644
index e5d1c4fff63..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- The husband, wife or civil partner gets the house up to a value of £473,000.
-<% end %>
-
-<% render_content_for :body do %>
- They also get:
-
- - furniture and moveable household goods up to the value of £29,000
- - £50,000 in cash
- - a third of the rest of the estate
-
- (If the cash left is less than £50,000, they will get all of the money.)
-
- The rest of the estate goes to the parent or parents.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..5b8fdf5fd99
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.erb
@@ -0,0 +1,21 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ They also get:
+
+ - up to £89,000 in cash
+ - a third of the rest of the estate (or the entire estate if the cash sum was less than £89,000)
+
+ The rest of the estate is divided in half between any surviving:
+
+ - parents
+ - brothers or sisters
+
+ If a brother or sister has already died, their children (nieces or nephews of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.govspeak.erb
deleted file mode 100644
index 02c75136be6..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- They also get:
-
- - up to £89,000 in cash
- - a third of the rest of the estate (or the entire estate if the cash sum was less than £89,000)
-
- The rest of the estate is divided in half between any surviving:
-
- - parents
- - brothers or sisters
-
- If a brother or sister has already died, their children (nieces or nephews of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..f5944d41abb
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is split in two, half goes to the parents and half to the brothers or sisters.
+<% end %>
+
+<% govspeak_for :body do %>
+ If a brother or sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.govspeak.erb
deleted file mode 100644
index b90d1bb6e4e..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is split in two, half goes to the parents and half to the brothers or sisters.
-<% end %>
-
-<% render_content_for :body do %>
- If a brother or sister has already died, their children (nieces and nephews of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..4cc1bd3f2f2
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between any great aunts or great uncles.
+<% end %>
+
+<% govspeak_for :body do %>
+ They may have to pay Inheritance Tax.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.govspeak.erb
deleted file mode 100644
index 23206132597..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between any great aunts or great uncles.
-<% end %>
-
-<% render_content_for :body do %>
- They may have to pay Inheritance Tax.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..e59d6daa055
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The whole estate goes to the Crown.
+<% end %>
+
+<% govspeak_for :body do %>
+ However, before this can happen there would need to be proof that there are no surviving relatives in any generation.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.govspeak.erb
deleted file mode 100644
index 44f7e2dcbd0..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The whole estate goes to the Crown.
-<% end %>
-
-<% render_content_for :body do %>
- However, before this can happen there would need to be proof that there are no surviving relatives in any generation.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..8c9c2011edc
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the grandparent(s).
+<% end %>
+
+<% govspeak_for :body do %>
+ They may have to pay Inheritance Tax.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.govspeak.erb
deleted file mode 100644
index 4c165c08dc2..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the grandparent(s).
-<% end %>
-
-<% render_content_for :body do %>
- They may have to pay Inheritance Tax.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..d9d3b8afa7a
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ The estate is shared equally between the aunts or uncles.
+<% end %>
+
+<% govspeak_for :body do %>
+ If an aunt or uncle has already died, their children (the cousins of the deceased) inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.govspeak.erb
deleted file mode 100644
index 1bedcb2b4e3..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the aunts or uncles.
-<% end %>
-
-<% render_content_for :body do %>
- If an aunt or uncle has already died, their children (the cousins of the deceased) inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..094dc71b99b
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.erb
@@ -0,0 +1,7 @@
+<% 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 %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.govspeak.erb
deleted file mode 100644
index 9507324942d..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..cfe33494211
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.erb
@@ -0,0 +1,17 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
+
+ They also get one third of the rest of the estate.
+
+ The remaining two-thirds are shared between their children.
+
+ If a son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.govspeak.erb
deleted file mode 100644
index ce726fdc950..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
-
- They also get one third of the rest of the estate.
-
- The remaining two-thirds are shared between their children.
-
- If a son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..175d631e313
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.erb
@@ -0,0 +1,18 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
+
+ The remainder of the estate is divided in half between the:
+
+ - husband, wife or civil partner
+ - son or daughter
+
+ If the son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their parent’s place.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.govspeak.erb
deleted file mode 100644
index 8532c3702f0..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
-
- The remainder of the estate is divided in half between the:
-
- - husband, wife or civil partner
- - son or daughter
-
- If the son or daughter has already died, their children (the grandchildren of the deceased) will inherit in their parent’s place.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..84f32835fd4
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.erb
@@ -0,0 +1,15 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
+
+ They also get half of the amount left over.
+
+ The remainder goes to the parents.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.govspeak.erb
deleted file mode 100644
index 7a5f7a0b7d3..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
-
- They also get half of the amount left over.
-
- The remainder goes to the parents.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..346526cf98e
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.erb
@@ -0,0 +1,17 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
+
+ They also get half the amount left over.
+
+ The remainder is divided between any brothers or sisters.
+
+ If any brother or sister is dead, their children (the deceased’s nieces and nephews) inherit.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.govspeak.erb
deleted file mode 100644
index c8b9bab4433..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- The husband, wife or civil partner must survive the deceased by at least 28 days to inherit.
-
- They also get half the amount left over.
-
- The remainder is divided between any brothers or sisters.
-
- If any brother or sister is dead, their children (the deceased’s nieces and nephews) inherit.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..094dc71b99b
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.erb
@@ -0,0 +1,7 @@
+<% 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 %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.govspeak.erb
deleted file mode 100644
index 9507324942d..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..8f9e0629be8
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ The estate is shared equally between the children.
+<% end %>
+
+<% govspeak_for :body do %>
+ If a son or daughter has already died, their children (the grandchildren of the deceased) inherit in their place.
+
+ They may have to pay Inheritance Tax.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.govspeak.erb
deleted file mode 100644
index 74bb17e5c77..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- The estate is shared equally between the children.
-<% end %>
-
-<% render_content_for :body do %>
- If a son or daughter has already died, their children (the grandchildren of the deceased) inherit in their place.
-
- They may have to pay Inheritance Tax.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..f4e39b65bd4
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% govspeak_for :body do %>
+ If nobody claims the estate, the whole estate goes to the Crown.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <%= render partial: 'next_step_links', locals: { next_steps: next_steps } %>
+<% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.govspeak.erb
deleted file mode 100644
index 8fbfce76516..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- If nobody claims the estate, the whole estate goes to the Crown.
-<% end %>
-
-<% render_content_for :next_steps do %>
- <%= render partial: 'next_step_links.govspeak.erb', locals: { next_steps: next_steps } %>
-<% 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
new file mode 100644
index 00000000000..b41ba834c85
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the deceased have any aunts or uncles?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.govspeak.erb
deleted file mode 100644
index ef9d96a7a65..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the deceased have any aunts or uncles?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..8e2ecdf89e6
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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/children.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.govspeak.erb
deleted file mode 100644
index cd74e29acac..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a0c66282223
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is the estate likely to be worth more than £250,000?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.govspeak.erb
deleted file mode 100644
index ee826de60ac..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is the estate likely to be worth more than £250,000?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..05a4b37af94
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is the estate likely to be worth more than £270,000?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.govspeak.erb
deleted file mode 100644
index 9e7878ac8cb..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is the estate likely to be worth more than £270,000?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4c8df513adc
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are there any living grandparents?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.govspeak.erb
deleted file mode 100644
index 1d0fe945e66..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are there any living grandparents?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..8785b79107f
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Are there any living great aunts or great uncles?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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/great_aunts_or_uncles.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.govspeak.erb
deleted file mode 100644
index fa5b25227df..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Are there any living great aunts or great uncles?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..1c8a33a09fd
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the deceased have any half-aunts or half-uncles?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.govspeak.erb
deleted file mode 100644
index d34ff5df081..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the deceased have any half-aunts or half-uncles?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4d828e59c3b
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the deceased have any half-brothers or half-sisters?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.govspeak.erb
deleted file mode 100644
index 56fad346a5c..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the deceased have any half-brothers or half-sisters?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..1ea2f72c01d
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did they have more than one child?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.govspeak.erb
deleted file mode 100644
index e0eb83cdf50..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did they have more than one child?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..d37c3b736d3
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are there any living parents?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.govspeak.erb
deleted file mode 100644
index 86945659d1a..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are there any living parents?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4f039c7d158
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Is there a living husband, wife or civil partner?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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/partner.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.govspeak.erb
deleted file mode 100644
index 85052599d25..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Is there a living husband, wife or civil partner?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..29248c8f789
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where did the deceased live?
+<% end %>
+
+<% options(
+ "england-and-wales": "England and Wales",
+ "scotland": "Scotland",
+ "northern-ireland": "Northern Ireland"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.govspeak.erb
deleted file mode 100644
index b6a548b33e9..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where did the deceased live?
-<% end %>
-
-<% options(
- "england-and-wales": "England and Wales",
- "scotland": "Scotland",
- "northern-ireland": "Northern Ireland"
-) %>
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
new file mode 100644
index 00000000000..14edb5ecc75
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the deceased have any brothers or sisters?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.govspeak.erb
deleted file mode 100644
index cccbf9e2d07..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the deceased have any brothers or sisters?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..14edb5ecc75
--- /dev/null
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the deceased have any brothers or sisters?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.govspeak.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.govspeak.erb
deleted file mode 100644
index cccbf9e2d07..00000000000
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the deceased have any brothers or sisters?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..75943909bd3
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.erb
@@ -0,0 +1,22 @@
+<% text_for :title do %>
+ Check if someone can rent your residential property
+<% end %>
+
+<% text_for :meta_description do %>
+ You need to check if a tenant is allowed to rent private residential property in England
+<% end %>
+
+<% govspeak_for :body do %>
+ Find out if someone can rent your private residential property in England.
+
+ You must check anyone aged 18 or over who pays to use your property as their main home, for example, tenants, sub-tenants and paying house guests.
+
+ %You might [get a fine](/penalties-illegal-renting) if you rent your property to someone who doesn’t have the right to rent.%
+
+ If you’ve bought a property that already has tenants, you need proof that their last landlord did the check. You’ll still be responsible for carrying out [further checks](/check-tenant-right-to-rent-documents/further-checks) on your tenants in future.
+
+ Because of coronavirus (COVID‑19) there are [temporary changes to the way you can check documents](/guidance/coronavirus-covid-19-landlord-right-to-rent-checks). These changes include asking for documents digitally, making checks on a video call, and what to do if someone cannot provide any accepted documents.
+
+ ^Read more about the [right to rent documents](/government/publications/right-to-rent-document-checks-a-user-guide) you can accept.^
+
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.govspeak.erb
deleted file mode 100644
index cc0c67c91e6..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.govspeak.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% render_content_for :title do %>
- Check if someone can rent your residential property
-<% end %>
-
-<% render_content_for :meta_description do %>
- You need to check if a tenant is allowed to rent private residential property in England
-<% end %>
-
-<% render_content_for :body do %>
- Find out if someone can rent your private residential property in England.
-
- You must check anyone aged 18 or over who pays to use your property as their main home, for example, tenants, sub-tenants and paying house guests.
-
- %You might [get a fine](/penalties-illegal-renting) if you rent your property to someone who doesn’t have the right to rent.%
-
- If you’ve bought a property that already has tenants, you need proof that their last landlord did the check. You’ll still be responsible for carrying out [further checks](/check-tenant-right-to-rent-documents/further-checks) on your tenants in future.
-
- Because of coronavirus (COVID‑19) there are [temporary changes to the way you can check documents](/guidance/coronavirus-covid-19-landlord-right-to-rent-checks). These changes include asking for documents digitally, making checks on a video call, and what to do if someone cannot provide any accepted documents.
-
- ^Read more about the [right to rent documents](/government/publications/right-to-rent-document-checks-a-user-guide) you can accept.^
-
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/_landlord_code_of_practice.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/_landlord_code_of_practice.erb
similarity index 100%
rename from lib/smart_answer_flows/landlord-immigration-check/outcomes/_landlord_code_of_practice.govspeak.erb
rename to lib/smart_answer_flows/landlord-immigration-check/outcomes/_landlord_code_of_practice.erb
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.erb
new file mode 100644
index 00000000000..eaf4cc7929b
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.erb
@@ -0,0 +1,8 @@
+<% govspeak_for :body do %>
+ The person can’t rent your property because they haven’t shown you documents to prove their right to rent.
+
+ If the person is already renting your property, you must [report them to the Home Office.](https://eforms.homeoffice.gov.uk/outreach/lcs-reporting.ofml)
+
+ You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
+
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.govspeak.erb
deleted file mode 100644
index 9063d0f91a9..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_continue_renting.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :body do %>
- The person can’t rent your property because they haven’t shown you documents to prove their right to rent.
-
- If the person is already renting your property, you must [report them to the Home Office.](https://eforms.homeoffice.gov.uk/outreach/lcs-reporting.ofml)
-
- You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
-
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.erb
new file mode 100644
index 00000000000..71ecf272a69
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.erb
@@ -0,0 +1,8 @@
+<% govspeak_for :body do %>
+ This person can’t rent your property because they haven’t shown you documents to prove their right to rent.
+
+ ^If you think they do have the right to rent, [check the full list of documents](/government/publications/right-to-rent-document-checks-a-user-guide) they can show you as proof.^
+
+ You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
+
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.govspeak.erb
deleted file mode 100644
index b8e828bc261..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_not_rent.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :body do %>
- This person can’t rent your property because they haven’t shown you documents to prove their right to rent.
-
- ^If you think they do have the right to rent, [check the full list of documents](/government/publications/right-to-rent-document-checks-a-user-guide) they can show you as proof.^
-
- You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
-
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.erb
new file mode 100644
index 00000000000..706f6c5f5b2
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ This person can rent the property.
+
+ You need to make a copy of the [relevant parts of the documents](/check-tenant-right-to-rent-documents) and keep the copies for 12 months after the tenancy has ended.
+
+ You don’t have to make this check again.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.govspeak.erb
deleted file mode 100644
index 5f5a95f490c..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- This person can rent the property.
-
- You need to make a copy of the [relevant parts of the documents](/check-tenant-right-to-rent-documents) and keep the copies for 12 months after the tenancy has ended.
-
- You don’t have to make this check again.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.erb
new file mode 100644
index 00000000000..39e15183e95
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ This person can currently rent the property.
+
+ You need to make a copy of the [relevant parts of the documents](/check-tenant-right-to-rent-documents).
+
+ If the tenant's right to stay in the UK is for less than 12 months, check again just before 12 months' time. Otherwise check again just before their right to stay in the UK runs out.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.govspeak.erb
deleted file mode 100644
index 82b6ca14963..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_can_rent_but_check_will_be_needed_again.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- This person can currently rent the property.
-
- You need to make a copy of the [relevant parts of the documents](/check-tenant-right-to-rent-documents).
-
- If the tenant's right to stay in the UK is for less than 12 months, check again just before 12 months' time. Otherwise check again just before their right to stay in the UK runs out.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.erb
new file mode 100644
index 00000000000..93decd35b21
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You don’t have to make a check if the student is in:
+
+ - a halls of residence
+ - any accommodation provided by their educational institution
+ - any private accommodation agreed between the educational institution and the landlord
+
+ You’ll have to carry out a check in all other cases.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.govspeak.erb
deleted file mode 100644
index 93e19cd46b7..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_may_be_needed_when_student.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You don’t have to make a check if the student is in:
-
- - a halls of residence
- - any accommodation provided by their educational institution
- - any private accommodation agreed between the educational institution and the landlord
-
- You’ll have to carry out a check in all other cases.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.erb
new file mode 100644
index 00000000000..61aee3386f8
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.erb
@@ -0,0 +1,8 @@
+<% govspeak_for :body do %>
+ You’ll have to carry out a right to rent check if:
+
+ - there’s a break clause within the lease
+ - there’s a clause for right of re-entry for the landlord
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.govspeak.erb
deleted file mode 100644
index 67b96f0c634..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_needed_if_break_clause.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :body do %>
- You’ll have to carry out a right to rent check if:
-
- - there’s a break clause within the lease
- - there’s a clause for right of re-entry for the landlord
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.erb
new file mode 100644
index 00000000000..c14b9d4b748
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can only do a right to rent check in England.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+
+ You can [register for updates](https://gov.smartwebportal.co.uk/homeoffice/public/webform.asp?id=27&id2=07821F) about the right to rent check and when it'll apply across the UK.
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.govspeak.erb
deleted file mode 100644
index 80c665efb3f..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can only do a right to rent check in England.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-
- You can [register for updates](https://gov.smartwebportal.co.uk/homeoffice/public/webform.asp?id=27&id2=07821F) about the right to rent check and when it'll apply across the UK.
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.erb
new file mode 100644
index 00000000000..facd2743fca
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.erb
@@ -0,0 +1,14 @@
+<% govspeak_for :body do %>
+ You don’t need to make a check if both of the following apply:
+
+ - you're letting the property for holiday or leisure
+ - you're letting the property to the person for under 3 months
+
+ You’ll have to make a check if:
+
+ - you’re letting the property to the same person for longer than 3 months
+ - the booking for the property is open-ended
+ - you’ve extended the time the person has booked the property more than once
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.govspeak.erb
deleted file mode 100644
index 2a583bfc5ae..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_if_holiday_or_under_3_months.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :body do %>
- You don’t need to make a check if both of the following apply:
-
- - you're letting the property for holiday or leisure
- - you're letting the property to the person for under 3 months
-
- You’ll have to make a check if:
-
- - you’re letting the property to the same person for longer than 3 months
- - the booking for the property is open-ended
- - you’ve extended the time the person has booked the property more than once
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.erb
new file mode 100644
index 00000000000..b7dcb6d0038
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You don’t need to make a right to rent check.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.govspeak.erb
deleted file mode 100644
index 4919e3d8303..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_care_home.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You don’t need to make a right to rent check.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.erb
new file mode 100644
index 00000000000..7571f14803f
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You don’t have to make a check on the person if you’re providing accommodation as a part of training or employment.
+
+ You will have to carry out a check on any adult dependents of the person if they aren’t being trained or employed.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.govspeak.erb
deleted file mode 100644
index 8dc62342d6b..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_employee_home.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You don’t have to make a check on the person if you’re providing accommodation as a part of training or employment.
-
- You will have to carry out a check on any adult dependents of the person if they aren’t being trained or employed.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.erb
new file mode 100644
index 00000000000..a7c3707ef7b
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You don’t need to make right to rent check if the person is staying in a hostel or refuge:
+
+ - that is managed by a social landlord, voluntary organisation or charity
+ - that isn’t operated as a commercial basis
+ - that is partly or wholly funded by a government department, agency or local authority
+
+ You’ll have to carry out a check in all other cases.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.govspeak.erb
deleted file mode 100644
index ef30aa9f0f3..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_hostel_refuge.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You don’t need to make right to rent check if the person is staying in a hostel or refuge:
-
- - that is managed by a social landlord, voluntary organisation or charity
- - that isn’t operated as a commercial basis
- - that is partly or wholly funded by a government department, agency or local authority
-
- You’ll have to carry out a check in all other cases.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.erb
new file mode 100644
index 00000000000..8792e042445
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You don’t need to make a right to rent check if the mobile home is the person's main home.
+
+ A right to rent check will need to carried out if they lease the mobile home to another person.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.govspeak.erb
deleted file mode 100644
index 21bae11ff87..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_mobile_home.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You don’t need to make a right to rent check if the mobile home is the person's main home.
-
- A right to rent check will need to carried out if they lease the mobile home to another person.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.erb
new file mode 100644
index 00000000000..f942bb8fee8
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You don’t have to make a check if you’re reasonably satisfied that the person is under 18 years old.
+
+ <%= render partial: 'landlord_code_of_practice' %>
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.govspeak.erb
deleted file mode 100644
index ff0821d42aa..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_check_not_needed_when_under_18.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You don’t have to make a check if you’re reasonably satisfied that the person is under 18 years old.
-
- <%= render partial: 'landlord_code_of_practice.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.erb
new file mode 100644
index 00000000000..b3a3b010810
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You must [check with the Home Office](https://eforms.homeoffice.gov.uk/outreach/lcs-application.ofml) to find out if the tenant is allowed to rent property. You’ll need the person’s Home Office reference number.
+
+ You’ll get an answer within 2 working days.
+
+ If the person’s allowed to rent, the Home Office will tell you if you need to check their documents again later.
+
+ You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.govspeak.erb
deleted file mode 100644
index 1c6d5f749a6..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/outcomes/outcome_landlords_checking_service.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You must [check with the Home Office](https://eforms.homeoffice.gov.uk/outreach/lcs-application.ofml) to find out if the tenant is allowed to rent property. You’ll need the person’s Home Office reference number.
-
- You’ll get an answer within 2 working days.
-
- If the person’s allowed to rent, the Home Office will tell you if you need to check their documents again later.
-
- You can read the landlord’s [code of practice](/government/publications/right-to-rent-landlords-code-of-practice) on making checks for more information.
-<% 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
new file mode 100644
index 00000000000..1afc6616d86
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does the person have a UK residence card (current or expired) marked ‘permanent residence’?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.govspeak.erb
deleted file mode 100644
index 6f6196074e1..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does the person have a UK residence card (current or expired) marked ‘permanent residence’?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..336b77c4aab
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.erb
@@ -0,0 +1,17 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ This can be any of the following:
+
+ - a biometric ‘residence permit’ card
+ - a ‘certificate of entitlement’ in their foreign passport
+ - a ‘travel document' or ‘immigration status document’
+ - an ‘exempt vignette’ (sticker in their foreign passport) - it could also be marked ‘official’ or ‘diplomatic’
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.govspeak.erb
deleted file mode 100644
index 8e9c741a3c1..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- Does the person have a Home Office document marked ‘exempt from immigration control’, ‘no time limit’ or ‘right of abode’?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- This can be any of the following:
-
- - a biometric ‘residence permit’ card
- - a ‘certificate of entitlement’ in their foreign passport
- - a ‘travel document' or ‘immigration status document’
- - an ‘exempt vignette’ (sticker in their foreign passport) - it could also be marked ‘official’ or ‘diplomatic’
-<% 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
new file mode 100644
index 00000000000..b030804255d
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ Has the person proved they’re an EU, EEA or Swiss national by showing you their current or expired:
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ - passport or national identity card
+ - UK registration certificate marked 'Residence documentation'
+<% end %>
+
+<% 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_eu_documents.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.govspeak.erb
deleted file mode 100644
index 171ccdd8b54..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- Has the person proved they’re an EU, EEA or Swiss national by showing you their current or expired:
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- - passport or national identity card
- - UK registration certificate marked 'Residence documentation'
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0f16633a604
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.erb
@@ -0,0 +1,24 @@
+<% text_for :title do %>
+ Does the person have 2 of the following:
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ - a current UK driving licence (full or provisional)
+ - a full birth or adoption certificate from the UK, Channel Islands, Isle of Man or Ireland (listing at least one birth or adoptive parent)
+ - a letter from their employer giving their National Insurance or employee number and the employer’s name, signature and company address (dated within the past 3 months)
+ - a letter confirming they’re enrolled to study, the course name and how long it lasts (from a UK further or higher education institution, dated within the past 3 months)
+ - benefits paperwork from HMRC, a local authority, the Department for Work and Pensions (DWP) or Jobcentre Plus (dated within the past 3 months)
+ - a Disclosure and Barring Service (DBS) certificate from a criminal records check (dated within the past 3 months)
+ - evidence the person is currently serving in the UK armed forces or has previously served
+ - a letter from a private rented sector access scheme, confirming the address of the property it’s helping the person rent from you (dated within the past 3 months)
+ - a letter from a British passport holder in an [accepted profession](/government/publications/right-to-rent-landlords-code-of-practice/code-of-practice-on-illegal-immigrants-and-private-rented-accommodation-for-tenancies-starting-on-or-after-1-february-2016#annex-a-list-of-acceptable-professional-persons) who’s known them for at least 3 months, with the professional’s name, address, signature, passport number, profession, most recent work address, how long they’ve known the person and in what capacity (dated within the past 3 months)
+ - a letter confirming they’re known to a UK government department or local authority, with the signature and work address of a named official (dated within the past 3 months)
+ - a letter from the UK police confirming that their passport or biometric residence permit was stolen, with the crime reference number (dated within the past 3 months)
+ - a letter confirming they’ve been released from prison within the past 6 months, with their date of birth (from HM, Scottish or Northern Ireland Prison Service)
+ - a letter confirming they’re on probation, from their offender manager (dated within the past 3 months)
+ <% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.govspeak.erb
deleted file mode 100644
index 64a159c2f61..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.govspeak.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% render_content_for :title do %>
- Does the person have 2 of the following:
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- - a current UK driving licence (full or provisional)
- - a full birth or adoption certificate from the UK, Channel Islands, Isle of Man or Ireland (listing at least one birth or adoptive parent)
- - a letter from their employer giving their National Insurance or employee number and the employer’s name, signature and company address (dated within the past 3 months)
- - a letter confirming they’re enrolled to study, the course name and how long it lasts (from a UK further or higher education institution, dated within the past 3 months)
- - benefits paperwork from HMRC, a local authority, the Department for Work and Pensions (DWP) or Jobcentre Plus (dated within the past 3 months)
- - a Disclosure and Barring Service (DBS) certificate from a criminal records check (dated within the past 3 months)
- - evidence the person is currently serving in the UK armed forces or has previously served
- - a letter from a private rented sector access scheme, confirming the address of the property it’s helping the person rent from you (dated within the past 3 months)
- - a letter from a British passport holder in an [accepted profession](/government/publications/right-to-rent-landlords-code-of-practice/code-of-practice-on-illegal-immigrants-and-private-rented-accommodation-for-tenancies-starting-on-or-after-1-february-2016#annex-a-list-of-acceptable-professional-persons) who’s known them for at least 3 months, with the professional’s name, address, signature, passport number, profession, most recent work address, how long they’ve known the person and in what capacity (dated within the past 3 months)
- - a letter confirming they’re known to a UK government department or local authority, with the signature and work address of a named official (dated within the past 3 months)
- - a letter from the UK police confirming that their passport or biometric residence permit was stolen, with the crime reference number (dated within the past 3 months)
- - a letter confirming they’ve been released from prison within the past 6 months, with their date of birth (from HM, Scottish or Northern Ireland Prison Service)
- - a letter confirming they’re on probation, from their offender manager (dated within the past 3 months)
- <% 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
new file mode 100644
index 00000000000..ec0c3927c36
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Does the person have a current UK residence card marked with any of the following.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ - family member - EU residence
+ - derivative residence
+ - accession residence
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.govspeak.erb
deleted file mode 100644
index 3f7428a24af..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Does the person have a current UK residence card marked with any of the following.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- - family member - EU residence
- - derivative residence
- - accession residence
-<% 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
new file mode 100644
index 00000000000..d0ea0511ca5
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Does the person have any of the following:
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ - a British or Irish passport (current or expired)
+ - a certificate of naturalisation or registration as a British citizen
+ - a UK ‘certificate of entitlement to the right of abode’ (in their current or expired foreign passport)
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.govspeak.erb
deleted file mode 100644
index 929f8cbc9c0..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Does the person have any of the following:
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- - a British or Irish passport (current or expired)
- - a certificate of naturalisation or registration as a British citizen
- - a UK ‘certificate of entitlement to the right of abode’ (in their current or expired foreign passport)
-<% 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
new file mode 100644
index 00000000000..7d34fd8a0e3
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the Home Office tell the person they have special permission to rent?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.govspeak.erb
deleted file mode 100644
index be6bfd5c0c1..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the Home Office tell the person they have special permission to rent?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..89cc70adc51
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Is the person renting the property as their main home?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ This includes:
+
+ - tenancy agreement
+ - a lease
+ - a licence
+ - sub-lease or sub-tenancy
+ - lodgers
+ - house guests or family members who pay rent
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.govspeak.erb
deleted file mode 100644
index 69a510b8911..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Is the person renting the property as their main home?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- This includes:
-
- - tenancy agreement
- - a lease
- - a licence
- - sub-lease or sub-tenancy
- - lodgers
- - house guests or family members who pay rent
-<% 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
new file mode 100644
index 00000000000..eb9dd68206c
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/property.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Enter the postcode of the property you want to let:
+<% end %>
+
+<% text_for :error_postcode_invalid do %>
+ Invalid postcode
+<% end %>
+<% text_for :error_postcode_incomplete do %>
+ Please enter a full postcode
+<% end %>
+<% 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.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/property.govspeak.erb
deleted file mode 100644
index 3686b469e0b..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/property.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Enter the postcode of the property you want to let:
-<% end %>
-
-<% render_content_for :error_postcode_invalid do %>
- Invalid postcode
-<% end %>
-<% render_content_for :error_postcode_incomplete do %>
- Please enter a full postcode
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..bfe54317481
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ What kind of property are you letting?
+<% end %>
+
+<% options(
+ "holiday_accommodation": "holiday accommodation",
+ "social_housing": "social housing",
+ "care_home": "a care home or hospice",
+ "hostel_or_refuge": "a hostel or refuge",
+ "mobile_home": "a mobile home",
+ "employee_accommodation": "accommodation to an employee or as part of training, eg tied accommodation",
+ "student_accommodation": "student accommodation",
+ "7_year_lease_property": "a residential property with a lease for 7 years or more"
+) %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.govspeak.erb
deleted file mode 100644
index 187e8ff9307..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- What kind of property are you letting?
-<% end %>
-
-<% options(
- "holiday_accommodation": "holiday accommodation",
- "social_housing": "social housing",
- "care_home": "a care home or hospice",
- "hostel_or_refuge": "a hostel or refuge",
- "mobile_home": "a mobile home",
- "employee_accommodation": "accommodation to an employee or as part of training, eg tied accommodation",
- "student_accommodation": "student accommodation",
- "7_year_lease_property": "a residential property with a lease for 7 years or more"
-) %>
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
new file mode 100644
index 00000000000..782ef304a82
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is the person at least 18 years of age?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.govspeak.erb
deleted file mode 100644
index f0c789cc6bf..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is the person at least 18 years of age?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..68e414e2d6e
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.erb
@@ -0,0 +1,16 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ This can be any of the following:
+
+ - a sticker or stamp in their passport
+ - a biometric ‘residence permit’ card
+ - a ‘travel document’ or ‘immigration status document’
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.govspeak.erb
deleted file mode 100644
index df187101ed3..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- This can be any of the following:
-
- - a sticker or stamp in their passport
- - a biometric ‘residence permit’ card
- - a ‘travel document’ or ‘immigration status document’
-<% 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
new file mode 100644
index 00000000000..9cb0c6fd72f
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ If the person doesn’t have the right documents, are they waiting for:
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ - the Home Office to return their documents
+ - a decision on their immigration case or visa application
+ - a decision on their immigration appeal or administrative review
+<% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.govspeak.erb
deleted file mode 100644
index 90aba490cd8..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- If the person doesn’t have the right documents, are they waiting for:
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- - the Home Office to return their documents
- - a decision on their immigration case or visa application
- - a decision on their immigration appeal or administrative review
-<% 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
new file mode 100644
index 00000000000..db84f4d96ef
--- /dev/null
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Is the person:
+<% end %>
+
+<% options(
+ "british-or-irish": "a British or Irish citizen",
+ "eea": "from another EU country, the EEA or Switzerland",
+ "non-eea": "a non-EEA family member of someone from the EU, EEA or Switzerland",
+ "somewhere-else": "From somewhere else or you don’t know",
+) %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.govspeak.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.govspeak.erb
deleted file mode 100644
index 19f242397d5..00000000000
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Is the person:
-<% end %>
-
-<% options(
- "british-or-irish": "a British or Irish citizen",
- "eea": "from another EU country, the EEA or Switzerland",
- "non-eea": "a non-EEA family member of someone from the EU, EEA or Switzerland",
- "somewhere-else": "From somewhere else or you don’t know",
-) %>
diff --git a/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb b/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb
new file mode 100644
index 00000000000..8fcc94ef1a1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb
@@ -0,0 +1,24 @@
+<% text_for :title do %>
+ Getting married abroad
+<% end %>
+
+<% text_for :meta_description do %>
+ Requirements, paperwork and processes for weddings and civil partnerships overseas - registration, restrictions, fees
+<% end %>
+
+<% govspeak_for :body do %>
+If you’re a British national getting a marriage or civil partnership abroad, you might need certain documents from the UK government, for example a certificate of no impediment (CNI).
+
+Use this tool to find out how to get the documents you'll need.
+
+You'll need to contact the local authorities where you want to get married to find out what you need to do.
+
+Your marriage or civil partnership will be recognised in the UK if both of the following apply:
+
+- you followed the correct process in the country where you got married
+- it would be allowed [under UK law](/marriages-civil-partnerships)
+
+^ There’s a separate guide if you want to [get married or enter into a civil partnership in the UK](/marriages-civil-partnerships).
+
+*[CNI]: certificate of no impediment
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/marriage_abroad.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/marriage_abroad.govspeak.erb
deleted file mode 100644
index 8e1abbaea2e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/marriage_abroad.govspeak.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% render_content_for :title do %>
- Getting married abroad
-<% end %>
-
-<% render_content_for :meta_description do %>
- Requirements, paperwork and processes for weddings and civil partnerships overseas - registration, restrictions, fees
-<% end %>
-
-<% render_content_for :body do %>
-If you’re a British national getting a marriage or civil partnership abroad, you might need certain documents from the UK government, for example a certificate of no impediment (CNI).
-
-Use this tool to find out how to get the documents you'll need.
-
-You'll need to contact the local authorities where you want to get married to find out what you need to do.
-
-Your marriage or civil partnership will be recognised in the UK if both of the following apply:
-
-- you followed the correct process in the country where you got married
-- it would be allowed [under UK law](/marriages-civil-partnerships)
-
-^ There’s a separate guide if you want to [get married or enter into a civil partnership in the UK](/marriages-civil-partnerships).
-
-*[CNI]: certificate of no impediment
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_affirmation_os_translation_in_local_language_text.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_affirmation_os_translation_in_local_language_text.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_affirmation_os_translation_in_local_language_text.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_affirmation_os_translation_in_local_language_text.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_morocco.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_morocco.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_morocco.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_morocco.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_norway.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_norway.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_norway.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_appointment_for_affidavit_norway.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_callout_partner_equivalent_document.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_callout_partner_equivalent_document.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_callout_partner_equivalent_document.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_callout_partner_equivalent_document.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_change_of_name_evidence.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_change_of_name_evidence.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_change_of_name_evidence.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_change_of_name_evidence.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_cni_needs_to_be_legalised.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_cni_needs_to_be_legalised.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_cni_needs_to_be_legalised.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_cni_needs_to_be_legalised.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_uk_issued_cnis_accepted.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_uk_issued_cnis_accepted.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_uk_issued_cnis_accepted.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_check_if_uk_issued_cnis_accepted.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_at_local_register_office.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_at_local_register_office.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_cni_at_local_register_office.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_cni_at_local_register_office.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_issued_locally_validity.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_issued_locally_validity.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_cni_issued_locally_validity.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_cni_issued_locally_validity.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_os_consular_facilities_unavailable.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_cni_os_consular_facilities_unavailable.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_cni_os_consular_facilities_unavailable.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_cni_os_consular_facilities_unavailable.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_complete_affirmation_or_affidavit_forms.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_complete_affirmation_or_affidavit_forms.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_complete_affirmation_or_affidavit_forms.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_complete_affirmation_or_affidavit_forms.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_consular_cni_os_not_uk_resident_ceremony_not_germany.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_consular_cni_os_not_uk_resident_ceremony_not_germany.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_consular_cni_os_not_uk_resident_ceremony_not_germany.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_consular_cni_os_not_uk_resident_ceremony_not_germany.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_consular_fees_table_items.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_consular_fees_table_items.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_consular_fees_table_items.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_consular_fees_table_items.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_details_for_gibraltar.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_details_for_gibraltar.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_details_for_gibraltar.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_details_for_gibraltar.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_cp.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_cp.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_cp.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_cp.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_embassy_of_ceremony_country_in_uk_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_laadoul.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_laadoul.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_laadoul.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_laadoul.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_cp.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_cp.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_cp.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_cp.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.erb
new file mode 100644
index 00000000000..1b9d6881e57
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.erb
@@ -0,0 +1,139 @@
+<% if calculator.partner_is_opposite_sex? %>
+ <% case calculator.ceremony_country %>
+ <% when 'albania' %>
+ [Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'angola' %>
+ [Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'armenia' %>
+ [Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'austria' %>
+ [Make an appointment at the embassy in Vienna.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vienna/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'bahrain' %>
+ [Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'belarus' %>
+ [Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'belgium' %>
+ [Make an appointment at the British embassy in Brussels.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-brussels/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'bolivia' %>
+ [Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'bosnia-and-herzegovina' %>
+ [Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'croatia' %>
+ [Make an appointment at the embassy in Zagreb.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-zagreb/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'cuba' %>
+ [Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'democratic-republic-of-the-congo' %>
+ [Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'estonia' %>
+ [Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'georgia' %>
+ [Make an appointment at the embassy in Tblisi.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tblisi/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'guatemala' %>
+ [Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'iceland' %>
+ [Make an appointment at the embassy in Reykjavik.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-reykjavik/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'kazakhstan' %>
+ [Make an appointment at the embassy in Astana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-astana/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'kosovo' %>
+ [Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'kyrgyzstan' %>
+ [Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'laos' %>
+ [Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'lebanon' %>
+ [Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'lithuania' %>
+ [Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'luxembourg' %>
+ [Make an appointment at the embassy in Luxembourg.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luxembourg/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'macao' %>
+ [Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'mexico' %>
+ [Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'mongolia' %>
+ [Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'montenegro' %>
+ [Make an appointment at the embassy in Podgorica.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-podgorica/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'morocco' %>
+ [Make an appointment at the embassy in Rabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-rabat/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'nepal' %>
+ [Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'norway' %>
+ [Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'oman' %>
+ [Make an appointment at the embassy in Muscat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-muscat/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'panama' %>
+ [Make an appointment at the embassy in Panama City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-panama-city/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'peru' %>
+ [Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'russia' %>
+ [Make an appointment at the embassy in Moscow.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-moscow/notice-of-marriage-or-civil-partnership/slot_picker)
+
+ [Make an appointment at the embassy in St Petersburg.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-st-petersburg/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'serbia' %>
+ [Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'slovenia' %>
+ [Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'south-korea' %>
+ [Make an appointment at the embassy in Seoul.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-seoul/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'sudan' %>
+ [Make an appointment at the embassy in Khartoum.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-khartoum/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'tajikistan' %>
+ [Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'turkmenistan' %>
+ [Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'united-arab-emirates' %>
+ [Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+ [Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'uzbekistan' %>
+ [Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'venezuela' %>
+ [Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% else %>
+ <%= render partial: 'shared/overseas_passports_embassies',
+ locals: {
+ overseas_passports_embassies: calculator.overseas_passports_embassies
+ } %>
+ <% end %>
+<% elsif calculator.partner_is_same_sex? %>
+ <% case calculator.ceremony_country %>
+ <% when 'albania' %>
+ [Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'belgium' %>
+ [Make an appointment at the British embassy in Brussels.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-brussels/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'bolivia' %>
+ [Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'cambodia' %>
+ You must post notice of your marriage at the British embassy in Phnom Penh.
+
+ [Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'peru' %>
+ [Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'estonia' %>
+ [Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'kosovo' %>
+ [Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'lithuania' %>
+ [Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'malta' %>
+ [Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'dominican-republic' %>
+ [Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'montenegro' %>
+ [Make an appointment at the embassy in Podgorica.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-podgorica/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% when 'norway' %>
+ [Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+ <% when 'serbia' %>
+ [Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+ <% else %>
+ <% if defined?(contact_message) %>
+ <%= contact_message %>
+
+ <% end %>
+ <%= render partial: 'shared/overseas_passports_embassies',
+ locals: {
+ overseas_passports_embassies: calculator.overseas_passports_embassies
+ } %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb
deleted file mode 100644
index df4c774a4b1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb
+++ /dev/null
@@ -1,139 +0,0 @@
-<% if calculator.partner_is_opposite_sex? %>
- <% case calculator.ceremony_country %>
- <% when 'albania' %>
- [Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'angola' %>
- [Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'armenia' %>
- [Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'austria' %>
- [Make an appointment at the embassy in Vienna.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vienna/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'bahrain' %>
- [Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'belarus' %>
- [Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'belgium' %>
- [Make an appointment at the British embassy in Brussels.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-brussels/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'bolivia' %>
- [Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'bosnia-and-herzegovina' %>
- [Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'croatia' %>
- [Make an appointment at the embassy in Zagreb.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-zagreb/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'cuba' %>
- [Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'democratic-republic-of-the-congo' %>
- [Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'estonia' %>
- [Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'georgia' %>
- [Make an appointment at the embassy in Tblisi.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tblisi/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'guatemala' %>
- [Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'iceland' %>
- [Make an appointment at the embassy in Reykjavik.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-reykjavik/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'kazakhstan' %>
- [Make an appointment at the embassy in Astana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-astana/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'kosovo' %>
- [Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'kyrgyzstan' %>
- [Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'laos' %>
- [Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'lebanon' %>
- [Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'lithuania' %>
- [Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'luxembourg' %>
- [Make an appointment at the embassy in Luxembourg.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luxembourg/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'macao' %>
- [Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'mexico' %>
- [Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'mongolia' %>
- [Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'montenegro' %>
- [Make an appointment at the embassy in Podgorica.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-podgorica/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'morocco' %>
- [Make an appointment at the embassy in Rabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-rabat/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'nepal' %>
- [Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'norway' %>
- [Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'oman' %>
- [Make an appointment at the embassy in Muscat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-muscat/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'panama' %>
- [Make an appointment at the embassy in Panama City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-panama-city/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'peru' %>
- [Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'russia' %>
- [Make an appointment at the embassy in Moscow.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-moscow/notice-of-marriage-or-civil-partnership/slot_picker)
-
- [Make an appointment at the embassy in St Petersburg.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-st-petersburg/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'serbia' %>
- [Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'slovenia' %>
- [Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'south-korea' %>
- [Make an appointment at the embassy in Seoul.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-seoul/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'sudan' %>
- [Make an appointment at the embassy in Khartoum.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-khartoum/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'tajikistan' %>
- [Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'turkmenistan' %>
- [Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'united-arab-emirates' %>
- [Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
- [Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'uzbekistan' %>
- [Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'venezuela' %>
- [Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
- <% else %>
- <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb',
- locals: {
- overseas_passports_embassies: calculator.overseas_passports_embassies
- } %>
- <% end %>
-<% elsif calculator.partner_is_same_sex? %>
- <% case calculator.ceremony_country %>
- <% when 'albania' %>
- [Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'belgium' %>
- [Make an appointment at the British embassy in Brussels.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-brussels/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'bolivia' %>
- [Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'cambodia' %>
- You must post notice of your marriage at the British embassy in Phnom Penh.
-
- [Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'peru' %>
- [Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'estonia' %>
- [Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'kosovo' %>
- [Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'lithuania' %>
- [Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'malta' %>
- [Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'dominican-republic' %>
- [Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'montenegro' %>
- [Make an appointment at the embassy in Podgorica.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-podgorica/notice-of-marriage-or-civil-partnership/slot_picker)
- <% when 'norway' %>
- [Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
- <% when 'serbia' %>
- [Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
- <% else %>
- <% if defined?(contact_message) %>
- <%= contact_message %>
-
- <% end %>
- <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb',
- locals: {
- overseas_passports_embassies: calculator.overseas_passports_embassies
- } %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_nearest_embassy_of_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_nearest_embassy_of_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_nearest_embassy_of_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_nearest_embassy_of_country.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_to_make_appointment.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_to_make_appointment.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_contact_to_make_appointment.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_contact_to_make_appointment.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_convert_cc_to_ss_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_convert_cc_to_ss_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_convert_cc_to_ss_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_convert_cc_to_ss_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_country_is_dutch_caribbean_island.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_country_is_dutch_caribbean_island.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_country_is_dutch_caribbean_island.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_country_is_dutch_caribbean_island.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_display_notice_of_marriage_7_days.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_display_notice_of_marriage_7_days.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_display_notice_of_marriage_7_days.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_display_notice_of_marriage_7_days.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_divorced_or_widowed_evidences.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_divorced_or_widowed_evidences.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_divorced_or_widowed_evidences.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_divorced_or_widowed_evidences.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_docs_decree_and_death_certificate.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_docs_decree_and_death_certificate.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_docs_decree_and_death_certificate.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_docs_decree_and_death_certificate.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed_colombia.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed_colombia.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed_colombia.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_documents_for_divorced_or_widowed_colombia.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_guidance_belgium.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_guidance_belgium.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_documents_guidance_belgium.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_documents_guidance_belgium.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_21_days_residency.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_21_days_residency.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_21_days_residency.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_21_days_residency.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_ss_british.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_ss_british.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_ss_british.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_documents_needed_ss_british.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_download_affidavit_and_affirmation_belgium.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_download_affidavit_and_affirmation_belgium.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_download_affidavit_and_affirmation_belgium.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_download_affidavit_and_affirmation_belgium.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_but_not_sign.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_but_not_sign.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_but_not_sign.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_but_not_sign.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_notice_and_affidavit_but_not_sign.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_notice_and_affidavit_but_not_sign.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_notice_and_affidavit_but_not_sign.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_download_and_fill_notice_and_affidavit_but_not_sign.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_fee_and_required_supporting_documents_for_appointment.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_fee_and_required_supporting_documents_for_appointment.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_fee_and_required_supporting_documents_for_appointment.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_fee_and_required_supporting_documents_for_appointment.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_advice.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_advice.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_advice.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_advice.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_and_travel_advice.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_and_travel_advice.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_and_travel_advice.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_get_legal_and_travel_advice.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni_local_resident.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni_local_resident.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni_local_resident.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_gulf_states_os_consular_cni_local_resident.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_have_documents_witnessed_to_get_cni.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_have_documents_witnessed_to_get_cni.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_have_documents_witnessed_to_get_cni.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_have_documents_witnessed_to_get_cni.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.erb
new file mode 100644
index 00000000000..e23b802ad32
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.erb
@@ -0,0 +1,6 @@
+<% if calculator.services.any? %>
+ <% if calculator.services_payment_partial_name.present? %>
+ <% partial = 'payment_information_partials/' + calculator.services_payment_partial_name + '' %>
+ <%= render partial: partial, locals: { calculator: calculator } %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.govspeak.erb
deleted file mode 100644
index 97296db6c88..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/_how_to_pay.govspeak.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if calculator.services.any? %>
- <% if calculator.services_payment_partial_name.present? %>
- <% partial = 'payment_information_partials/' + calculator.services_payment_partial_name + '.govspeak.erb' %>
- <%= render partial: partial, locals: { calculator: calculator } %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_legalisation_and_translation.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_legalisation_and_translation.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_legalisation_and_translation.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_legalisation_and_translation.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_legalise_translate_and_check_with_authorities.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_legalise_translate_and_check_with_authorities.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_legalise_translate_and_check_with_authorities.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_legalise_translate_and_check_with_authorities.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_legisation_and_translation_intro_uk.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_legisation_and_translation_intro_uk.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_legisation_and_translation_intro_uk.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_legisation_and_translation_intro_uk.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_names_on_documents_must_match.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_names_on_documents_must_match.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_names_on_documents_must_match.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_names_on_documents_must_match.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_in_14_days_ss_marriage_and_partnership.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_in_14_days_ss_marriage_and_partnership.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_in_14_days_ss_marriage_and_partnership.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_in_14_days_ss_marriage_and_partnership.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_ss_marriage_and_partnership.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_ss_marriage_and_partnership.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_ss_marriage_and_partnership.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_no_objection_ss_marriage_and_partnership.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_must_get_affirmation.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_must_get_affirmation.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_partner_must_get_affirmation.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_partner_must_get_affirmation.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_naturalisation_in_uk.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_naturalisation_in_uk.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_partner_naturalisation_in_uk.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_partner_naturalisation_in_uk.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_affirmation.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_affirmation.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_affirmation.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_affirmation.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_cni.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_cni.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_cni.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_partner_needs_cni.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_probably_needs_affirmation.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_partner_probably_needs_affirmation.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_partner_probably_needs_affirmation.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_partner_probably_needs_affirmation.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_pay_for_ss_registration_and_certificate.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_pay_for_ss_registration_and_certificate.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_pay_for_ss_registration_and_certificate.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_pay_for_ss_registration_and_certificate.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_provide_evidence_of_nationality_or_residence_for_divorce_or_dissolution.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_provide_evidence_of_nationality_or_residence_for_divorce_or_dissolution.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_provide_evidence_of_nationality_or_residence_for_divorce_or_dissolution.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_provide_evidence_of_nationality_or_residence_for_divorce_or_dissolution.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_provide_two_witnesses_ss_marriage_and_partnership.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_provide_two_witnesses_ss_marriage_and_partnership.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_provide_two_witnesses_ss_marriage_and_partnership.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_provide_two_witnesses_ss_marriage_and_partnership.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_egypt.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_egypt.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_egypt.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_egypt.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_macao.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_macao.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_macao.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_required_supporting_documents_macao.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.erb
new file mode 100644
index 00000000000..0b18e4195a0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.erb
@@ -0,0 +1,21 @@
+<% if calculator.services.any? %>
+ ## Fees
+
+ <%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+ <% unless calculator.country_without_consular_facilities? ||
+ calculator.ceremony_country_is_french_overseas_territory? ||
+ calculator.ceremony_country == 'indonesia' ||
+ calculator.ceremony_country == 'monaco' ||
+ calculator.ceremony_country == 'cambodia' ||
+ (calculator.ceremony_country == 'brazil' && calculator.resident_outside_of_third_country?) %>
+
+ You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for <%= calculator.country_name_lowercase_prefix %>](/government/publications/<%= calculator.ceremony_country %>-consular-fees).
+ <% end %>
+
+ <%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.govspeak.erb
deleted file mode 100644
index 6f614197337..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/_services_and_fees.govspeak.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% if calculator.services.any? %>
- ## Fees
-
- <%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
- <% unless calculator.country_without_consular_facilities? ||
- calculator.ceremony_country_is_french_overseas_territory? ||
- calculator.ceremony_country == 'indonesia' ||
- calculator.ceremony_country == 'monaco' ||
- calculator.ceremony_country == 'cambodia' ||
- (calculator.ceremony_country == 'brazil' && calculator.resident_outside_of_third_country?) %>
-
- You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for <%= calculator.country_name_lowercase_prefix %>](/government/publications/<%= calculator.ceremony_country %>-consular-fees).
- <% end %>
-
- <%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_synonyms_of_cp.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_synonyms_of_cp.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_synonyms_of_cp.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_synonyms_of_cp.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_three_day_residency_requirement.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_three_day_residency_requirement.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_three_day_residency_requirement.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_three_day_residency_requirement.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do_affirmation.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do_affirmation.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do_affirmation.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_what_you_need_to_do_affirmation.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_you_dont_need_to_stay_in_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_you_dont_need_to_stay_in_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_you_dont_need_to_stay_in_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_you_dont_need_to_stay_in_country.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_you_have_been_divorced_or_widowed.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_you_have_been_divorced_or_widowed.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_you_have_been_divorced_or_widowed.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_you_have_been_divorced_or_widowed.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_be_asked_for_cni.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_be_asked_for_cni.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_be_asked_for_cni.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_be_asked_for_cni.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_have_to_wait_to_get_married.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_have_to_wait_to_get_married.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_have_to_wait_to_get_married.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/_you_will_have_to_wait_to_get_married.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/afghanistan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..ba78be5d577
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 70f31b179a9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..b16c3f8e19b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 8802c4dc7fc..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..12b48e8195a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index cee29be7cba..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..12b48e8195a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index cee29be7cba..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Albania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Albania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Albania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Albania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Albania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..b16c3f8e19b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 8802c4dc7fc..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..b16c3f8e19b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 8802c4dc7fc..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..d4fa30976c7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
+
+[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 15d82d2a7a1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/albania/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Albania.
-
-[Make an appointment at the embassy in Tirana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tirana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Albania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Albania](/government/publications/albania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_british/_opposite_sex.erb
index dffca523a88..20ee625e913 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_british/_opposite_sex.erb
@@ -56,7 +56,7 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_local/_opposite_sex.erb
index d40c06a775d..94d76833e23 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_local/_opposite_sex.erb
@@ -56,7 +56,7 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_other/_opposite_sex.erb
index d40c06a775d..94d76833e23 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/algeria/ceremony_country/partner_other/_opposite_sex.erb
@@ -56,7 +56,7 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/american-samoa/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/andorra/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..68bcfd914ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index b97636954a5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..d87a0e09dad
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8de1e2042f3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..d87a0e09dad
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8de1e2042f3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Angola to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Angola. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Angola for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Luanda.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-luanda/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Angola, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Angola.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Angola](/government/publications/angola-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/angola/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/anguilla/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/antigua-and-barbuda/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/argentina/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..f97106b8fb7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0d7cda303e0..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..7e3655d6b27
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4dd6416deb4..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..7e3655d6b27
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4dd6416deb4..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Armenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Armenia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Armenia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Yerevan.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-yerevan/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Armenia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Armenia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Armenia](/government/publications/armenia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/armenia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/aruba/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/australia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_opposite_sex.erb
index fb5978cf834..5bb28aa3121 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_opposite_sex.erb
@@ -64,13 +64,13 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Austria](/government/publications/austria-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_same_sex.erb
index c2f1a7ec673..95471642c82 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_british/_same_sex.erb
@@ -52,7 +52,7 @@ They’ll then issue your CNI (as long as nobody has registered an objection). T
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_opposite_sex.erb
index 54548fa9082..5e5c049681d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_opposite_sex.erb
@@ -70,13 +70,13 @@ Opposite sex civil partnerships are not legally recognised in the UK.
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Austria](/government/publications/austria-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_same_sex.erb
index f062d1ed459..72a31b5d6c0 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_local/_same_sex.erb
@@ -56,7 +56,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_opposite_sex.erb
index e22b2769f37..436494c45d2 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_opposite_sex.erb
@@ -70,13 +70,13 @@ Opposite sex civil partnerships are not legally recognised in the UK.
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Austria](/government/publications/austria-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_same_sex.erb
index f062d1ed459..72a31b5d6c0 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/austria/ceremony_country/partner_other/_same_sex.erb
@@ -56,7 +56,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/azerbaijan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/azerbaijan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/azerbaijan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/azerbaijan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahamas/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..49dd67c5154
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0cc1d68a7df..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..0e6c60f0be9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 20af39269a3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..0e6c60f0be9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 20af39269a3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bahrain to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bahrain. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bahrain for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Manama.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-manama/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bahrain, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bahrain.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bahrain](/government/publications/bahrain-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bahrain/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bangladesh/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/barbados/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..96acbb87334
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
+
+You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bdf8d9398e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Belarus to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Belarus to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your and your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Minsk.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-minsk/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-You’ll need to complete an [‘Affidavit for marriage’](/government/publications/affidavitaffirmatin-forms-belarus) form.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Belarus](/government/publications/belarus-consular-fees).
-
-You can pay by cash only.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belarus/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belgium/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/belize/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/benin/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bermuda/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bhutan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..d6d87314c18
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index cd2b0865ebb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a25248aaac4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cb2263f5d7f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..f0a9aa42029
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 58fb5310189..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..f0a9aa42029
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 58fb5310189..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bolivia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bolivia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bolivia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bolivia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bolivia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a25248aaac4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cb2263f5d7f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a25248aaac4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cb2263f5d7f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..487236fd416
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Bolivia.
+
+[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 50f5bef42fa..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bolivia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Bolivia.
-
-[Make an appointment at the embassy in La Paz.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-la-paz/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Bolivia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bolivia](/government/publications/bolivia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bonaire-st-eustatius-saba/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..fb3da0de69f
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 11df550795f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..42de041a953
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 558b309332a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..42de041a953
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 558b309332a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Bosnia and Herzegovina to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bosnia and Herzegovina. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Bosnia and Herzegovina for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Sarajevo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sarajevo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Bosnia and Herzegovina, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Bosnia and Herzegovina.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bosnia and Herzegovina](/government/publications/bosnia-and-herzegovina-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bosnia-and-herzegovina/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/botswana/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_opposite_sex.erb
index 8d24d8d430b..705e1140851 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_opposite_sex.erb
@@ -65,7 +65,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_same_sex.erb
index 4d6d1a080de..df4372038d6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_british/_same_sex.erb
@@ -63,7 +63,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_opposite_sex.erb
index 8d24d8d430b..705e1140851 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_opposite_sex.erb
@@ -65,7 +65,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_same_sex.erb
index 4d6d1a080de..df4372038d6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_local/_same_sex.erb
@@ -63,7 +63,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_opposite_sex.erb
index 8d24d8d430b..705e1140851 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_opposite_sex.erb
@@ -65,7 +65,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_same_sex.erb
index 4d6d1a080de..df4372038d6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brazil/third_country/partner_other/_same_sex.erb
@@ -63,7 +63,7 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-indian-ocean-territory/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-indian-ocean-territory/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-indian-ocean-territory/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-indian-ocean-territory/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/british-virgin-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/brunei/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..2c7be27e78d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,96 @@
+Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
+
+CNIs issued in Bulgaria are valid for 6 months.
+
+You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+## Get your documents witnessed in front of a notary public
+
+Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
+
+Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+## Get your documents witnessed at the embassy
+
+[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
+
+You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
+
+[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
+
+^You don't need to stay in the country while your notice is posted.^
+
+Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
+
+$A
+Bulgarian Ministry of Foreign Affairs
+2 Alfred Nobel Street
+Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 807 64 23
+(+359) 2 807 64 28
+(+359) 2 807 64 26
+$C
+
+Your partner will be able to get their own equivalent document from their embassy or consulate.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index d92f9200bd3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,96 +0,0 @@
-Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
-
-CNIs issued in Bulgaria are valid for 6 months.
-
-You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-## Get your documents witnessed in front of a notary public
-
-Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
-
-Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-## Get your documents witnessed at the embassy
-
-[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
-
-You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
-
-[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
-
-^You don't need to stay in the country while your notice is posted.^
-
-Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
-
-$A
-Bulgarian Ministry of Foreign Affairs
-2 Alfred Nobel Street
-Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 807 64 23
-(+359) 2 807 64 28
-(+359) 2 807 64 26
-$C
-
-Your partner will be able to get their own equivalent document from their embassy or consulate.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..af2a993d9ee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,52 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1ea10e905be..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..051196dd065
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,98 @@
+Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
+
+CNIs issued in Bulgaria are valid for 6 months.
+
+You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+## Get your documents witnessed in front of a notary public
+
+Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
+
+Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+## Get your documents witnessed at the embassy
+
+[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
+
+You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
+
+[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
+
+^You don't need to stay in the country while your notice is posted.^
+
+Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
+
+$A
+Bulgarian Ministry of Foreign Affairs
+2 Alfred Nobel Street
+Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 807 64 23
+(+359) 2 807 64 28
+(+359) 2 807 64 26
+$C
+
+Your partner will be able to get their own equivalent document from their embassy or consulate.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index eac64f3fde3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
-
-CNIs issued in Bulgaria are valid for 6 months.
-
-You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-## Get your documents witnessed in front of a notary public
-
-Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
-
-Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-## Get your documents witnessed at the embassy
-
-[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
-
-You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
-
-[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
-
-^You don't need to stay in the country while your notice is posted.^
-
-Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
-
-$A
-Bulgarian Ministry of Foreign Affairs
-2 Alfred Nobel Street
-Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 807 64 23
-(+359) 2 807 64 28
-(+359) 2 807 64 26
-$C
-
-Your partner will be able to get their own equivalent document from their embassy or consulate.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..bef52dc9e72
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index acbe361ea8d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..051196dd065
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,98 @@
+Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
+
+CNIs issued in Bulgaria are valid for 6 months.
+
+You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+## Get your documents witnessed in front of a notary public
+
+Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
+
+Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+## Get your documents witnessed at the embassy
+
+[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
+
+You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
+
+[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
+
+^You don't need to stay in the country while your notice is posted.^
+
+Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
+
+$A
+Bulgarian Ministry of Foreign Affairs
+2 Alfred Nobel Street
+Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 807 64 23
+(+359) 2 807 64 28
+(+359) 2 807 64 26
+$C
+
+Your partner will be able to get their own equivalent document from their embassy or consulate.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index eac64f3fde3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-Contact the relevant local authorities in Bulgaria to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Bulgaria. You can do this at the British embassy or in front of a notary public.
-
-CNIs issued in Bulgaria are valid for 6 months.
-
-You’ll need to have been living in Bulgaria for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-The British embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-## Get your documents witnessed in front of a notary public
-
-Download a [‘Certificate of no impediment application pack’](/government/publications/certificate-of-no-impediment-application-pack-bulgaria), fill in the forms and take them with you to a notary public.
-
-Once the notary public has witnessed your documents, send the original documents to the British embassy in Sofia:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-## Get your documents witnessed at the embassy
-
-[Make an appointment at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate or flight tickets - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The consulate will display your notice of marriage publicly for 7 days before issuing your CNI.
-
-You can collect the CNI from the embassy or ask for it to be sent by courier to an address in Bulgaria. You’ll need to pay any courier fees.
-
-[Make an appointment to collect your CNI at the embassy in Sofia](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-sofia/certificate-of-no-impediment/slot_picker)
-
-^You don't need to stay in the country while your notice is posted.^
-
-Once you have your CNI, contact the Bulgarian Ministry of Foreign Affairs to get it legalised (certified as genuine).
-
-$A
-Bulgarian Ministry of Foreign Affairs
-2 Alfred Nobel Street
-Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 807 64 23
-(+359) 2 807 64 28
-(+359) 2 807 64 26
-$C
-
-Your partner will be able to get their own equivalent document from their embassy or consulate.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..0dee233ccbe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index a835731990a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..af2a993d9ee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,52 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1ea10e905be..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..bef52dc9e72
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index acbe361ea8d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..0dee233ccbe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index a835731990a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..af2a993d9ee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.erb
@@ -0,0 +1,52 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1ea10e905be..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..bef52dc9e72
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index acbe361ea8d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-%However, they can’t register a civil partnership between a British national and a national of Bulgaria.%
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..0dee233ccbe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.erb
@@ -0,0 +1,63 @@
+You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
+
+Contact them to make an appointment:
+
+$A
+British Embassy Sofia
+9, Moskovska St
+1000 Sofia
+Bulgaria
+$A
+
+$C
+Telephone: (+359) 2 933 9222
+Fax: (+359) 2 933 9250
+
+[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index a835731990a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/bulgaria/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Bulgaria.
-
-Contact them to make an appointment:
-
-$A
-British Embassy Sofia
-9, Moskovska St
-1000 Sofia
-Bulgaria
-$A
-
-$C
-Telephone: (+359) 2 933 9222
-Fax: (+359) 2 933 9250
-
-[British Embassy Sofia - opening hours](https://www.gov.uk/world/organisations/british-embassy-sofia/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Bulgaria), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Bulgaria](/government/publications/bulgaria-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burkina-faso/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/burundi/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..e6f5b2e7f29
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3716c11755a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..3db71ddf47b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,36 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1d07004448d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..47d782682c2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9735baffe6b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..bac0491f7a3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index c5487932cc9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..c106751bfd4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,36 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index b35e6f58a0b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..e6f5b2e7f29
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3716c11755a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..3db71ddf47b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,36 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1d07004448d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..47d782682c2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9735baffe6b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..bac0491f7a3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index c5487932cc9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..c106751bfd4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,36 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index b35e6f58a0b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..e6f5b2e7f29
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3716c11755a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..fda328fba52
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can only pay fees for consular services by cash in US dollars.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index d24a7c7464b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can only pay fees for consular services by cash in US dollars.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..47d782682c2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,39 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9735baffe6b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..bac0491f7a3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
+
+%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
+
+<%= render partial: 'what_you_need_to_do' %>
+
+If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
+
+<%= render partial: 'you_have_been_divorced_or_widowed' %>
+
+<%= render partial: 'change_of_name_evidence' %>
+
+<%= render partial: 'partner_probably_needs_affirmation' %>
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+<%= render partial: 'names_on_documents_must_match' %>
+
+## What happens next
+
+You’ll need to take the following to the Ministry of Foreign Affairs:
+
+- your affirmation
+- a [certified copy of your passport](/certifying-a-document)
+- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+You’ll be asked to provide a criminal record check – check with the embassy how to do this.
+
+The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
+
+You’ll need to take the approval letters to your local Sangkat for the marriage registration.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index c5487932cc9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-Contact the relevant local authorities in Cambodia (the local district office, ‘Sangkat’, and the Ministry of Foreign Affairs) to find out about local marriage laws, including what documents you’ll need.
-
-%There are certain restrictions on getting married in Cambodia if neither of you is Cambodian. If neither of you is Cambodian, you must check with both the Ministry of Foreign Affairs and the local Sangkat to find out if if you can get married.%
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-If the local authorities say you can get married, you’ll be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Cambodia to swear an affidavit (written statement of facts) that you’re free to marry.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to bring your passport, your partner’s passport (or Cambodian ID card) and pay a fee.
-
-<%= render partial: 'you_have_been_divorced_or_widowed.govspeak.erb' %>
-
-<%= render partial: 'change_of_name_evidence.govspeak.erb' %>
-
-<%= render partial: 'partner_probably_needs_affirmation.govspeak.erb' %>
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-<%= render partial: 'names_on_documents_must_match.govspeak.erb' %>
-
-## What happens next
-
-You’ll need to take the following to the Ministry of Foreign Affairs:
-
-- your affirmation
-- a [certified copy of your passport](/certifying-a-document)
-- your [birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-You’ll be asked to provide a criminal record check – check with the embassy how to do this.
-
-The Ministry of Foreign Affairs will issue an approval letter which you’ll need to take to the Ministry of Interior. The Ministry of Interior may ask you to complete additional forms and will give you an approval letter.
-
-You’ll need to take the approval letters to your local Sangkat for the marriage registration.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..6abd040537e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,42 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
+
+You must post notice of your marriage at the British embassy in Phnom Penh.
+
+[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+<%= render partial: 'what_you_need_to_do' %>
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+<%= render partial: 'partner_naturalisation_in_uk' %>
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can only pay fees for consular services by cash in US dollars.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 06e1083c13c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cambodia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Cambodia.
-
-You must post notice of your marriage at the British embassy in Phnom Penh.
-
-[Make an appointment at the embassy in Phnom Penh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-phnom-penh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You’ll both need to bring proof that you’ve been resident in Cambodia for the last 7 days.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-<%= render partial: 'what_you_need_to_do.govspeak.erb' %>
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-<%= render partial: 'partner_naturalisation_in_uk.govspeak.erb' %>
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can only pay fees for consular services by cash in US dollars.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cameroon/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/canada/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cape-verde/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cayman-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/central-african-republic/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chad/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..003d710c9c0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index fb94e0c755e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..654ae0e68cd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c5b271cf5ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..c0eb2971e0c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,63 @@
+Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 941789f4346..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..08c61276ace
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Chile.
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 9ad957e8625..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..c0eb2971e0c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,63 @@
+Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 941789f4346..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-Contact the relevant local authorities in Chile to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-chile).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Chile. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Chile for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Chile.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ccf879dda06
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index c9af787fcf2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..654ae0e68cd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c5b271cf5ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..ccf879dda06
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index c9af787fcf2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ccf879dda06
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index c9af787fcf2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..654ae0e68cd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c5b271cf5ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..ccf879dda06
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index c9af787fcf2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ccf879dda06
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Chile.
+
+[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index c9af787fcf2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/chile/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Chile.
-
-[Make an appointment at the embassy in Santiago.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-santiago/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Chile for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Chile](/government/publications/chile-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_same_sex.erb
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
new file mode 100644
index 00000000000..a9c4d45b07c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in China
+ <% else %>
+ Marriage in China
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.govspeak.erb
deleted file mode 100644
index e363d5ea076..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in China
- <% else %>
- Marriage in China
- <% end %>
-<% end %>
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
new file mode 100644
index 00000000000..5415547ab24
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in Colombia
+ <% else %>
+ Marriage in Colombia
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.govspeak.erb
deleted file mode 100644
index 0b3dc687bde..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in Colombia
- <% else %>
- Marriage in Colombia
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..01822432abe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index d90689a1c93..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..427e74f50d7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 8cdd8eb8fbe..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..5d22000e32f
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,42 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3449ce23340..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..3772154ce9c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 979409a9334..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..5d22000e32f
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,42 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3449ce23340..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3772154ce9c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 979409a9334..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Colombia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..2574b8a288e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,43 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
+
+## What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 606fe557543..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-colombia).
-
-## What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..707b4bc9ddf
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,40 @@
+Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator} %>
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index d58294a191b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the [Embassy of Colombia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Colombia](/foreign-travel-advice/colombia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Bogota to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Bogota.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bogot%25C3%25A1/oaths-affirmations-and-affidavits/slot_picker)
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Colombia](/government/publications/colombia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator} %>
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate/)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/comoros/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/costa-rica/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cote-d-ivoire/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_same_sex.erb
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
new file mode 100644
index 00000000000..3be0cd6f37d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Civil partnership in Croatia
+ <% else %>
+ Marriage in Croatia
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.govspeak.erb
deleted file mode 100644
index ffdd2a59172..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Civil partnership in Croatia
- <% else %>
- Marriage in Croatia
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..11fc2b81f80
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 7f264ccc6bb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..06b6b6c4173
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 594b9a5deea..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..06b6b6c4173
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 594b9a5deea..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Cuba to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Cuba. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Cuba for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Havana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-havana/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Cuba, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Cuba.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Cuba](/government/publications/cuba-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cuba/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/curacao/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/cyprus/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/czech-republic/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..a162e09c37a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,56 @@
+Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4ab26b27173..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..bc228323ae9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,58 @@
+Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 936501c5784..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..bc228323ae9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,58 @@
+Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 936501c5784..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-Contact the relevant local authorities in the Democratic Republic of the Congo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in the Democratic Republic of the Congo. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in the Democratic Republic of the Congo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kinshasa.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kinshasa/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in the Democratic Republic of the Congo.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Democratic Republic of the Congo](/government/publications/democratic-republic-of-the-congo-consular-fees).
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/democratic-republic-of-the-congo/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..a1d2df94ffb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,77 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0bb08de588a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,77 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..9e93dcd3493
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,79 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 383418a38c9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,79 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..d2953001cb4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,79 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index f049b4b87df..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,79 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..76bf71aa8dd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,83 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+##Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 58cb5c3a251..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-##Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..d585e4f05e2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,80 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 7d75d2cb0e3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It’s valid for 4 months. You’ll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..fda3fa24a8d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,83 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You need a marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 6a1cff4b6d1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You need a marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-To get a CNI, you must post notice of your intended marriage in Denmark. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Denmark for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Copenhagen.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-copenhagen/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/list-of-lawyers) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Denmark.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..1abb14dd266
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/opposite_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/opposite_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 96d90f9fc02..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/opposite_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/opposite_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..8e376e51d3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1128cebb3ff..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..573953f3a99
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,50 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_local/opposite_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_local/opposite_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 5bbb0ac703a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_local/opposite_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_local/opposite_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..2006399ebd7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,52 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+##Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 7a72cc5cd30..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-##Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..dfd76eca8c0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,53 @@
+Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_other/opposite_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_other/opposite_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 06adffc0368..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-Contact the relevant local authorities in Denmark to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a certificate of marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_other/opposite_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_other/opposite_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..23dc7aef4c9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,52 @@
+You can get married at a town hall or a Church of Denmark church.
+
+Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
+
+##What you need to do
+
+You need a marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
+
+You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
+
+If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
+
+###Document showing that you’re free to marry
+
+If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
+
+$C
+**General Register Office**\\
+Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
+$C
+
+If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
+
+If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
+
+###Certificate of no impediment (CNI)
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
+- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
+
+%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 56a61104f9a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-You can get married at a town hall or a Church of Denmark church.
-
-Contact the relevant local authorities in Denmark to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Denmark](/foreign-travel-advice/denmark) before making any plans.
-
-##What you need to do
-
-You need a marital status from the [Agency of Family Law](https://familieretshuset.dk/en). It's valid for 4 months. You'll have to pay a fee.
-
-You should apply for a document showing that you’re free to marry from the General Register Office, National Records of Scotland or nidirect.
-
-If you can’t apply for one of these documents you can get a certificate of no impediment (CNI) from the British Embassy or UK registrar.
-
-###Document showing that you’re free to marry
-
-If you are from England or Wales, you can get a ‘no trace letter’ from the General Register Office. ‘No trace letters’ cost £50 for each 10 year period from age 16 or when you entered the country. Specify how many years you need the search to cover and quote reference ‘SEARCH 123’. It can take up to 3 weeks for a ‘no trace letter’ to be issued.
-
-$C
-**General Register Office**\\
-Telephone: +44 (0)300 123 1837 (8am to 8pm Monday to Friday and 9am to 4pm Saturday)
-$C
-
-If you are from Scotland, you can get a ’to whom it may concern’ letter from the [National Records of Scotland](https://www.nrscotland.gov.uk/registration/getting-married-abroad/what-documents-will-i-need-to-provide).
-
-If you are from Northern Ireland, you can get a ‘certificate of legal capacity to marry' or a ‘marriage index search’ from [nidirect](https://www.nidirect.gov.uk/articles/marriage-outside-uk).
-
-###Certificate of no impediment (CNI)
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](/marriage-abroad/y/denmark/uk/partner_british/same_sex)
-- [go to Denmark and post notice at the embassy or consulate there](/marriage-abroad/y/denmark/ceremony_country/partner_british/same_sex)
-
-%If you choose to post notice, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Denmark](/government/publications/denmark-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/denmark/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/djibouti/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominica/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..975c2d9becd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.erb
@@ -0,0 +1,43 @@
+You may be able to get married at the British embassy or consulate in the Dominican Republic.
+
+[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 9bed637c5bf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/dominican-republic/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-You may be able to get married at the British embassy or consulate in the Dominican Republic.
-
-[Make an appointment at the embassy in Santo Domingo.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-santo-domingo/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in the Dominican Republic for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy will display your notice publicly for 14 days.
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the Dominican Republic](/government/publications/dominican-republic-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_opposite_sex.erb
index 12d1b1aa869..df5186775a9 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_opposite_sex.erb
@@ -24,14 +24,14 @@ You’ll also need to provide evidence if you’ve changed your name by deed pol
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_same_sex.erb
index 0c6d80efe7c..22dc9f3ecab 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_british/_same_sex.erb
@@ -10,11 +10,11 @@ You’ll need to bring your passport and pay a fee.
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_opposite_sex.erb
index e6d9c711dc6..3bc4cf314ae 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_same_sex.erb
index ea6cf6d664f..e038f4f3fe1 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_local/_same_sex.erb
@@ -14,14 +14,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_opposite_sex.erb
index e6d9c711dc6..3bc4cf314ae 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_same_sex.erb
index ea6cf6d664f..e038f4f3fe1 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/ceremony_country/partner_other/_same_sex.erb
@@ -14,14 +14,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_opposite_sex.erb
index 12d1b1aa869..df5186775a9 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_opposite_sex.erb
@@ -24,14 +24,14 @@ You’ll also need to provide evidence if you’ve changed your name by deed pol
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_same_sex.erb
index 842686c1d13..d477c3dfec6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_british/_same_sex.erb
@@ -12,14 +12,14 @@ You’ll need to bring your passport and pay a fee.
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_opposite_sex.erb
index e6d9c711dc6..3bc4cf314ae 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_same_sex.erb
index 38a7aba6d8f..795e168bc98 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_local/_same_sex.erb
@@ -16,14 +16,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_opposite_sex.erb
index e6d9c711dc6..3bc4cf314ae 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_same_sex.erb
index 38a7aba6d8f..795e168bc98 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/third_country/partner_other/_same_sex.erb
@@ -16,14 +16,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_opposite_sex.erb
index dd7fe44b9b1..963525f6450 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_opposite_sex.erb
@@ -24,14 +24,14 @@ You’ll also need to provide evidence if you’ve changed your name by deed pol
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_same_sex.erb
index 08b19534141..e796b1b236c 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_british/_same_sex.erb
@@ -12,14 +12,14 @@ You’ll need to bring your passport and pay a fee.
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_opposite_sex.erb
index 33a7a2ae175..81a64e5ae88 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_same_sex.erb
index bdc77f21737..23a598cd64e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_local/_same_sex.erb
@@ -16,14 +16,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_opposite_sex.erb
index 33a7a2ae175..81a64e5ae88 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_opposite_sex.erb
@@ -28,14 +28,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_same_sex.erb
index bdc77f21737..23a598cd64e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ecuador/uk/partner_other/_same_sex.erb
@@ -16,14 +16,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/egypt/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_british/_opposite_sex.erb
index 50f49d87ce3..2d95224b7a5 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_british/_opposite_sex.erb
@@ -48,7 +48,7 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_local/_opposite_sex.erb
index 70b8730f81a..eba1a8efcb6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_local/_opposite_sex.erb
@@ -50,7 +50,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_other/_opposite_sex.erb
index 70b8730f81a..eba1a8efcb6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/el-salvador/ceremony_country/partner_other/_opposite_sex.erb
@@ -50,7 +50,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/equatorial-guinea/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eritrea/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..7cb71afe178
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index aad93c629e9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..dc3436226ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 92f896df62f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..96057f5e6a4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,74 @@
+Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 958af8bbc93..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..96057f5e6a4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,74 @@
+Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 958af8bbc93..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-Contact the relevant local authorities in Estonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-tallinn).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Estonia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Estonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-^You may be able to get married without a CNI if you have a permanent address in Estonia and have a 6 month residence permit - contact the local authorities to find out.^
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Estonia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Estonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..dc3436226ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 92f896df62f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..dc3436226ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 92f896df62f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..fdfde22343a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Estonia.
+
+[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 0f75da7713a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/estonia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Estonia.
-
-[Make an appointment at the embassy in Tallinn.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-tallinn/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Estonia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Estonia](/government/publications/estonia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/eswatini/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ethiopia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ethiopia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ethiopia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ethiopia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/falkland-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/fiji/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_ceremony_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_ceremony_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_ceremony_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_ceremony_country.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_third_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_third_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_third_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_third_country.erb
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
new file mode 100644
index 00000000000..66ef897e8e1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Marriage in Finland
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.govspeak.erb
deleted file mode 100644
index 8e976d9bb12..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :title do %>
- Marriage in Finland
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_uk.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_uk.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_uk.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_uk.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_same_sex.erb
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
new file mode 100644
index 00000000000..568846860b8
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Marriage and PACS in France
+ <% else %>
+ Marriage and PACS in France
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.govspeak.erb
deleted file mode 100644
index e3418aad277..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Marriage and PACS in France
- <% else %>
- Marriage and PACS in France
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_french-guiana.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_french-guiana.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_french-guiana.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_french-guiana.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-guiana/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_french-polynesia.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_french-polynesia.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_french-polynesia.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_french-polynesia.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/french-polynesia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gabon/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/georgia/uk/partner_other/_same_sex.erb
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
new file mode 100644
index 00000000000..45771a9680b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ <% if calculator.partner_is_national_of_ceremony_country? %>
+ Same-sex marriage in Germany
+ <% else %>
+ Same-sex marriage in Germany
+ <% end %>
+ <% else %>
+ Marriage in Germany
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.govspeak.erb
deleted file mode 100644
index 57f2b0392f1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- <% if calculator.partner_is_national_of_ceremony_country? %>
- Same-sex marriage in Germany
- <% else %>
- Same-sex marriage in Germany
- <% end %>
- <% else %>
- Marriage in Germany
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ghana/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/gibraltar/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/ceremony_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/third_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/greece/uk/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/grenada/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_guadeloupe.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_guadeloupe.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_guadeloupe.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_guadeloupe.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guadeloupe/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..6aa2d1ffdd1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,58 @@
+Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index fa635eb1328..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..0853d13020a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 73117a84e7b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..6e8b3e44a43
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index cea25a38d7a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..6e8b3e44a43
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index cea25a38d7a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in Guatemala to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Guatemala. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Guatemala for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Guatamala City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-guatemala-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Guatemala.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..0853d13020a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 73117a84e7b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..0853d13020a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 73117a84e7b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..ec730ea3eef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
+
+Contact them to make an appointment:
+
+$A
+British Embassy
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 984324a0834..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guatemala/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Guatemala.
-
-Contact them to make an appointment:
-
-$A
-British Embassy
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-guatemala/office/british-embassy)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Guatemala), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Guatemala](/government/publications/guatemala-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea-bissau/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guinea/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/guyana/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/haiti/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..2be3a024e57
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+$A
+British Embassy Guatemala City (for Honduras)
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9ef97bfc35e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-$A
-British Embassy Guatemala City (for Honduras)
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..e2f39a4ea89
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+$A
+British Embassy Guatemala City (for Honduras)
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 98b92787621..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-$A
-British Embassy Guatemala City (for Honduras)
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..e2f39a4ea89
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+$A
+British Embassy Guatemala City (for Honduras)
+Edificio Torre Internacional,
+Nivel 11, 16 Calle 0-55,
+Zona 10 Guatemala City
+Guatemala
+$A
+
+$C
+Switchboard: +502-2380-7300
+
+[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 98b92787621..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Honduras to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Honduras. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Honduras for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-$A
-British Embassy Guatemala City (for Honduras)
-Edificio Torre Internacional,
-Nivel 11, 16 Calle 0-55,
-Zona 10 Guatemala City
-Guatemala
-$A
-
-$C
-Switchboard: +502-2380-7300
-
-[British Embassy Guatemala City (for Honduras) - opening hours](https://www.gov.uk/world/organisations/british-embassy-honduras/office/british-embassy)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Honduras.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Honduras](/government/publications/honduras-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/honduras/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hong-kong/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..353681a3f26
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
+
+You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index af0504af9a6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
-
-You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..8b1cbf08271
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Hungary.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c6826b57fc8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Hungary.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..69b34c43f8c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,62 @@
+Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
+
+You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 17d3eb13d1a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
-
-You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..351edbf1535
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
+
+You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index f3e96289b3d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Hungary to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Hungary. You can do this at the British embassy.
-
-You’ll need to have been living in Hungary for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-Take the oath at the embassy and they'll display your notice of marriage publicly for 7 days. They'll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Hungary.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..8b1cbf08271
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Hungary.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c6826b57fc8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Hungary.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..8b1cbf08271
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Hungary.
+
+[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c6826b57fc8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Hungary.
-
-[Make an appointment at the embassy in Budapest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-budapest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Hungary for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Hungary](/government/publications/hungary-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/hungary/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_ceremony_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_ceremony_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_ceremony_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_ceremony_country.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_third_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_third_country.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_third_country.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_third_country.erb
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
new file mode 100644
index 00000000000..a0eeb088d55
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Marriage and Civil partnership in Iceland
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.govspeak.erb
deleted file mode 100644
index 5a0516fea59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :title do %>
- Marriage and Civil partnership in Iceland
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_uk.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_uk.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_uk.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_uk.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/india/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/india/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/india/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/india/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/indonesia/uk/partner_other/_same_sex.erb
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
new file mode 100644
index 00000000000..b4a6896132e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage and civil partnership in Iran
+ <% else %>
+ Marriage in Iran
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.govspeak.erb
deleted file mode 100644
index 33206873926..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage and civil partnership in Iran
- <% else %>
- Marriage in Iran
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..1b753b2aae1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,64 @@
+Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
+
+You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
+
+[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath.
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 404b17ad3cb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
-
-You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
-
-[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath.
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..1b753b2aae1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,64 @@
+Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
+
+You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
+
+[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath.
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 404b17ad3cb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
-
-You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
-
-[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath.
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..1b753b2aae1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,64 @@
+Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
+
+You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
+
+[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath.
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 404b17ad3cb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-Contact the relevant local authorities in Iran to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Iran. You can do this at the British embassy.
-
-You’ll need to have been living in Iran for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You and your partner must be over the age of 16. If your partner is a female Iranian national and this is her first marriage, you’ll need to get parental permission from her father. You don’t need to get parental permission for second marriages.
-
-[Make an appointment at the embassy in Tehran.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tehran/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath.
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Iran.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Iran](/government/publications/Iran-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/iraq/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ireland/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/israel/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/ceremony_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/third_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/italy/uk/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jamaica/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/japan/_title.erb
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
new file mode 100644
index 00000000000..0310c4400e3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage and civil partnership in Jordan
+ <% else %>
+ Marriage in Jordan
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.govspeak.erb
deleted file mode 100644
index 76eb7b348eb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage and civil partnership in Jordan
- <% else %>
- Marriage in Jordan
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..671cfa4a09c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,57 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 63b483d21f8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..75ee8ff3899
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 72fd32605cd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..75ee8ff3899
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 72fd32605cd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..7eb499e7afd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,57 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 6aa5970ce41..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..a622ccab3b4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index cfc2633c9cd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..a622ccab3b4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index cfc2633c9cd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the relevant local authorities in Jordan to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:Certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..dd485dee5f3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,57 @@
+Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 5131abcfac6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..2114e78321e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index b05fc3ef1e6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..2114e78321e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
+
+##What you need to do
+
+###Islamic marriages
+
+If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
+
+You’ll need to pay a fee and bring your passport and your partner’s passport.
+
+^Documents must be originals if you are getting married at the Sharia Court.^
+
+###Non-Islamic marriages
+
+For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
+
+You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
+
+[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
+
+You need to bring:
+
+- the affidavit form if you have filled it in advance
+- your passport
+- your partner’s passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
+
+###If you’re divorced, widowed or been previously in a civil partnership
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a decree absolute or final order
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s death certificate
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###If you can’t have a religious ceremony
+
+If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
+
+You’ll need to pay separate fees for this service.
+
+Email for more information.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+<%= render partial: 'services_and_fees',
+ locals: { calculator: calculator } %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index b05fc3ef1e6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-Contact the [Embassy of Jordan](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^There are no civil marriages in Jordan, but you can get married through a religious ceremony at a church or Sharia court.^
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Jordan](/foreign-travel-advice/jordan) before making any plans.
-
-##What you need to do
-
-###Islamic marriages
-
-If you’re getting married at the Sharia Court, you’ll need to provide a single declaration document to prove you’re allowed to marry or a single divorced declaration document if you’re divorced.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-single-declaration-for-an-islamic-marriage/slot_picker) to get a copy of the single declaration.
-
-You’ll need to pay a fee and bring your passport and your partner’s passport.
-
-^Documents must be originals if you are getting married at the Sharia Court.^
-
-###Non-Islamic marriages
-
-For non-Islamic marriages, you’ll be asked to swear an oath before you get married. You must do this at the British Embassy in Amman.
-
-You can download and fill in (but not sign) the [affidavit form](https://www.gov.uk/government/publications/affidavit-of-marital-status-jordan) in advance.
-
-[Make an appointment at the embassy in Amman](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-amman/administer-a-marital-affidavit-for-a-christian-marriage/slot_picker).
-
-You need to bring:
-
-- the affidavit form if you have filled it in advance
-- your passport
-- your partner’s passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need equivalent documents for your partner
-
-###If you’re divorced, widowed or been previously in a civil partnership
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a decree absolute or final order
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s death certificate
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it legalised and translated if it’s not in English.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###If you can’t have a religious ceremony
-
-If you can’t get married at church or Sharia Court, you may be able to get married at the British Embassy in Amman. You and your partner both need to be resident in Jordan and need to prove that there are no other suitable facilities to get married locally.
-
-You’ll need to pay separate fees for this service.
-
-Email for more information.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-<%= render partial: 'services_and_fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..8478a86580c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
+
+[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
+
+You can pay by cash in the local currency or by credit or debit card.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index c5b38ae75a7..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
-
-[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
-
-You can pay by cash in the local currency or by credit or debit card.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..fefa5c9380c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,74 @@
+Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
+
+[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
+
+You can pay by cash in the local currency or by credit or debit card.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9d904e23e0a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
-
-[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
-
-You can pay by cash in the local currency or by credit or debit card.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..fefa5c9380c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,74 @@
+Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
+
+[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
+
+You can pay by cash in the local currency or by credit or debit card.
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9d904e23e0a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-Contact the relevant local authorities in Kazakhstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in Kazakhstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Nur-Sultan.
-
-[Make an appointment at the embassy in Nur-Sultan](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-nursultan/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kazakhstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kazakhstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kazakhstan](/government/publications/kazakhstan-consular-fees).
-
-You can pay by cash in the local currency or by credit or debit card.
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kazakhstan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kenya/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kenya/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kenya/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kenya/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kiribati/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..930f938e756
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,59 @@
+Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
+
+[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
+
+[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
+$D
+
+##What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3a57708e995..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
-
-[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
-
-[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
-$D
-
-##What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..9b64f088637
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1e104606ccd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..930f938e756
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,59 @@
+Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
+
+[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
+
+[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
+$D
+
+##What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3a57708e995..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
-
-[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
-
-[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
-$D
-
-##What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..930f938e756
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,59 @@
+Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
+
+[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
+
+You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
+
+[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
+$D
+
+##What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3a57708e995..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-Contact the relevant local authorities in Kosovo to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kosovo. You can do this at the British embassy or in front of a notary public.
-
-[Make an appointment at the embassy in Pristina](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker).
-
-You’ll need to have been living in Kosovo for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-The embassy will provide you with forms for your notice of marriage, and an oath or affidavit (written statement of facts) stating that you’re free to marry. You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Notice of marriage’](/government/publications/notice-of-marriage-form--2)
-
-[Download ‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form)
-$D
-
-##What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (eg marriage certificate or deed poll).%
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kosovo.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..90e059f70af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 4ff468e092e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..9b64f088637
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1e104606ccd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..90e059f70af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 4ff468e092e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..9b64f088637
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 1e104606ccd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..90e059f70af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Kosovo.
+
+[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 4ff468e092e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kosovo/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Kosovo.
-
-[Make an appointment at the embassy in Pristina.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-pristina/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Kosovo for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kosovo](/government/publications/kosovo-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kuwait/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kuwait/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kuwait/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kuwait/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..32f60944037
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
+
+[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 163e4c7f348..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
-
-[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..507b501deb1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
+
+[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 585d530c6b6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
-
-[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..507b501deb1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
+
+[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 585d530c6b6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Kyrgyzstan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Kyrgyzstan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Kyrgyzstan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-If you need a CNI, you’ll first need to give notice of your intended marriage (banns) at the British Embassy Office in Bishkek.
-
-[Make an appointment at the embassy in Bishkek.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Kyrgyzstan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Kyrgyzstan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Kyrgyzstan](/government/publications/kyrgyzstan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/kyrgyzstan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..8603f8c26a3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Laos to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
+
+##What you need to do
+
+You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
+
+Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
+
+[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to pay a fee and bring the following to your appointment:
+
+- your passport
+- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 282eb7d30f4..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Laos to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
-
-##What you need to do
-
-You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
-
-Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
-
-[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to pay a fee and bring the following to your appointment:
-
-- your passport
-- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..8603f8c26a3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the relevant local authorities in Laos to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
+
+##What you need to do
+
+You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
+
+Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
+
+[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to pay a fee and bring the following to your appointment:
+
+- your passport
+- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 282eb7d30f4..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the relevant local authorities in Laos to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
-
-##What you need to do
-
-You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
-
-Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
-
-[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to pay a fee and bring the following to your appointment:
-
-- your passport
-- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..ddf75cfba0e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,46 @@
+Contact the [Embassy of Laos](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
+
+##What you need to do
+
+You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
+
+Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
+
+[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to pay a fee and bring the following to your appointment:
+
+- your passport
+- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index cbdb7248fc4..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Contact the [Embassy of Laos](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Laos](/foreign-travel-advice/laos) before making any plans.
-
-##What you need to do
-
-You may be asked to provide an [affirmation of freedom to marry document](/government/publications/information-for-british-nationals-intending-to-marry-in-laos) to prove you’re allowed to marry.
-
-Make an appointment at the British Embassy in Vientiane to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s ID and pay a fee.
-
-[Make an appointment at the embassy in Vientiane.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vientiane/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to pay a fee and bring the following to your appointment:
-
-- your passport
-- your [birth certificate](/order-copy-birth-death-marriage-certificate/) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, eg a residence certificate - check with the embassy or consulate for advice
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Laos](/government/publications/laos-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/laos/uk/partner_other/_same_sex.erb
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
new file mode 100644
index 00000000000..c552cd5bbe0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.erb
@@ -0,0 +1,11 @@
+<% 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
+ <% else %>
+ Same-sex marriage in Latvia
+ <% end %>
+ <% else %>
+ Marriage in Latvia
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.govspeak.erb
deleted file mode 100644
index c09fd970940..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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
- <% else %>
- Same-sex marriage in Latvia
- <% end %>
- <% else %>
- Marriage in Latvia
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..257f89bab11
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 87c9b98a82b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..af772326a9a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 1b9b1b046ca..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..257f89bab11
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 87c9b98a82b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..af772326a9a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 1b9b1b046ca..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..257f89bab11
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 87c9b98a82b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..af772326a9a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,45 @@
+You may be able to get married at the British embassy or consulate in Latvia.
+
+[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 1b9b1b046ca..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-You may be able to get married at the British embassy or consulate in Latvia.
-
-[Make an appointment at the embassy in Riga.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riga/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Latvia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Latvia](/government/publications/latvia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..9adc33a4b11
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4299daf1af3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..b8f4861906e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index e634dd6b6bb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..b8f4861906e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index e634dd6b6bb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..40b1543b343
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index f204f8588e1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..582b9e1e6f1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0ae80644c8c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..582b9e1e6f1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0ae80644c8c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Lebanon to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..a2fcf055bc7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 194c67f2c21..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..5e3a407dcc1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index f338387c15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..5e3a407dcc1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index f338387c15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the [Embassy of Lebanon](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Lebanon](/foreign-travel-advice/lebanon) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Lebanon to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Beirut.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-beirut/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lebanon](/government/publications/lebanon-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lebanon/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lesotho/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liberia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/libya/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/liechtenstein/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..c934d7267cc
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8db5329c9a2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..e10d0c688e5
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Lithuania.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 261e8bd1f82..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Lithuania.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..697553c7970
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index a263511b7f1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..697553c7970
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index a263511b7f1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Lithuania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Lithuania. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Lithuania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Lithuania, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Lithuania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..e10d0c688e5
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Lithuania.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 261e8bd1f82..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Lithuania.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..e10d0c688e5
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to get married at the British embassy or consulate in Lithuania.
+
+[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 261e8bd1f82..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to get married at the British embassy or consulate in Lithuania.
-
-[Make an appointment at the embassy in Vilnius.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-vilnius/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Lithuania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Lithuania](/government/publications/lithuania-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/lithuania/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/luxembourg/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/luxembourg/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/luxembourg/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/luxembourg/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..0e9fc40e9f4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,56 @@
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9319e13489a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..44dc02eac39
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,60 @@
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0f34c579d25..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..44dc02eac39
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,60 @@
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0f34c579d25..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..104fb5ecbc2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,57 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index c1b558671b6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..47fa2115fa1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,61 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 782bd722bcf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..47fa2115fa1
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 782bd722bcf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the relevant local authorities in Macao to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..b159777e169
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,57 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index e6db1737baf..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..82f05e8a1d6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,61 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 20ad41a8c19..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..82f05e8a1d6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,61 @@
+You can only get married in Macao if you or your partner live there, eg on a valid work visa.
+
+Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
+
+You can download and fill in (but not sign) the forms in advance.
+
+$D
+[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
+[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
+$D
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- your partner’s passport (if they’re not British)
+- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
+- equivalent documents for your partner
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 20ad41a8c19..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-You can only get married in Macao if you or your partner live there, eg on a valid work visa.
-
-Contact the [Embassy of Macao](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Macao](/foreign-travel-advice/macao) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British Consulate General Hong Kong to swear an affirmation/affadavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the British Consulate General Hong Kong.](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-hong-kong/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an ‘Affirmation for marriage’ (non-religious) form or an ‘Affidavit for marriage’ (religious) form in English.
-
-You can download and fill in (but not sign) the forms in advance.
-
-$D
-[Download ‘Affidavit for marriage’](/government/publications/affidavit-form-macao)
-[Download ’Affirmation for marriage’](/government/publications/affirmation-form-macao)
-$D
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- your partner’s passport (if they’re not British)
-- your [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof of residence, such as a residence certificate - check with the embassy or local notary public to find out what you need
-- equivalent documents for your partner
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Macao](/government/publications/macao-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/macao/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/madagascar/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malawi/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malaysia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malaysia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malaysia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malaysia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/maldives/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..47b493b99de
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to register a civil partnership or get married at the High Commission of Malta.
+
+Contact them to make an appointment:
+
+[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+Once you’ve made your appointment, the high commission will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index e0bfafd2f01..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/malta/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to register a civil partnership or get married at the High Commission of Malta.
-
-Contact them to make an appointment:
-
-[Make an appointment at the embassy in Valletta.](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-valletta/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Malta for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-Once you’ve made your appointment, the high commission will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee, the high commission will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the high commission which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Malta](/government/publications/malta-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/marshall-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_martinique.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_martinique.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_martinique.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_martinique.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/martinique/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritania/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mauritius/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_mayotte.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_mayotte.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_mayotte.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_mayotte.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mayotte/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..181c2467687
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 36bcb759cf6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..448590b4e08
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 94c284b5642..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..448590b4e08
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,72 @@
+Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
+
+## What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 94c284b5642..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-Contact the relevant local authorities in Mexico to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-You might be able to form an opposite sex civil partnership. Check the local rules with the [British embassy](/world/organisations/british-embassy-mexico-city).
-
-## What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Mexico. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Mexico for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Mexico City.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-mexico-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Mexico, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Mexico.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mexico](/government/publications/mexico-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mexico/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/micronesia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/moldova/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/moldova/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/moldova/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/moldova/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_pacs.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_pacs.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_pacs.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_pacs.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/monaco/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..0e7092abe73
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index ac27a4aa510..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a5a1868e526
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,76 @@
+You may be able to get married at the British embassy or consulate in Mongolia.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Ulaanbaatar
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Ulaanbaatar
+Mongolia
+$A
+
+$C
+Telephone: +976 11 458 133
+Fax: +976 11 458036
+
+Email:
+
+[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
+$C
+
+$A
+Consular services
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Mongolia
+$A
+
+$C
+Consular Contact: +976(11) 458133
+
+Email:
+
+[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
+$C
+
+##What documents you’ll need
+
+You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index a0a2ecec875..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-You may be able to get married at the British embassy or consulate in Mongolia.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Ulaanbaatar
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Ulaanbaatar
-Mongolia
-$A
-
-$C
-Telephone: +976 11 458 133
-Fax: +976 11 458036
-
-Email:
-
-[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
-$C
-
-$A
-Consular services
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Mongolia
-$A
-
-$C
-Consular Contact: +976(11) 458133
-
-Email:
-
-[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
-$C
-
-##What documents you’ll need
-
-You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..428c35c70e6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3cf40ebb277..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..428c35c70e6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3cf40ebb277..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..821e2b9f1af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index ed7030b5336..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a5a1868e526
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,76 @@
+You may be able to get married at the British embassy or consulate in Mongolia.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Ulaanbaatar
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Ulaanbaatar
+Mongolia
+$A
+
+$C
+Telephone: +976 11 458 133
+Fax: +976 11 458036
+
+Email:
+
+[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
+$C
+
+$A
+Consular services
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Mongolia
+$A
+
+$C
+Consular Contact: +976(11) 458133
+
+Email:
+
+[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
+$C
+
+##What documents you’ll need
+
+You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index a0a2ecec875..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-You may be able to get married at the British embassy or consulate in Mongolia.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Ulaanbaatar
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Ulaanbaatar
-Mongolia
-$A
-
-$C
-Telephone: +976 11 458 133
-Fax: +976 11 458036
-
-Email:
-
-[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
-$C
-
-$A
-Consular services
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Mongolia
-$A
-
-$C
-Consular Contact: +976(11) 458133
-
-Email:
-
-[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
-$C
-
-##What documents you’ll need
-
-You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..e5be98bf3eb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index c2c9cd0b789..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..e5be98bf3eb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index c2c9cd0b789..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Mongolia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..6c63909dc80
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8e3e2506fc1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a5a1868e526
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,76 @@
+You may be able to get married at the British embassy or consulate in Mongolia.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Ulaanbaatar
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Ulaanbaatar
+Mongolia
+$A
+
+$C
+Telephone: +976 11 458 133
+Fax: +976 11 458036
+
+Email:
+
+[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
+$C
+
+$A
+Consular services
+Peace Avenue 30, Bayanzurkh District
+Ulaanbaatar ZIP 13381
+Mongolia
+$A
+
+$C
+Consular Contact: +976(11) 458133
+
+Email:
+
+[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
+$C
+
+##What documents you’ll need
+
+You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index a0a2ecec875..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-You may be able to get married at the British embassy or consulate in Mongolia.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Ulaanbaatar
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Ulaanbaatar
-Mongolia
-$A
-
-$C
-Telephone: +976 11 458 133
-Fax: +976 11 458036
-
-Email:
-
-[British Embassy Ulaanbaatar - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/british-embassy-ulaanbaatar)
-$C
-
-$A
-Consular services
-Peace Avenue 30, Bayanzurkh District
-Ulaanbaatar ZIP 13381
-Mongolia
-$A
-
-$C
-Consular Contact: +976(11) 458133
-
-Email:
-
-[Consular services - opening hours](https://www.gov.uk/world/organisations/british-embassy-ulaanbaatar/office/consular-services)
-$C
-
-##What documents you’ll need
-
-You need to have been living in Mongolia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..f9b817378ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 2b4b0234830..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..f9b817378ba
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 2b4b0234830..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the [Embassy of Mongolia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Mongolia](/foreign-travel-advice/mongolia) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Mongolia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ulaanbaatar.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ulaanbaatar/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Mongolia](/government/publications/mongolia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mongolia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/ceremony_country/partner_british/_same_sex.erb
index 56a222b25d2..81e6afc2268 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/ceremony_country/partner_british/_same_sex.erb
@@ -34,14 +34,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Montenegro](/government/publications/montenegro-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/third_country/partner_british/_same_sex.erb
index 56a222b25d2..81e6afc2268 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/third_country/partner_british/_same_sex.erb
@@ -34,14 +34,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Montenegro](/government/publications/montenegro-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/uk/partner_british/_same_sex.erb
index 56a222b25d2..81e6afc2268 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/uk/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montenegro/uk/partner_british/_same_sex.erb
@@ -34,14 +34,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Montenegro](/government/publications/montenegro-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/montserrat/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_british/_opposite_sex.erb
index ba543c83cdb..5369f6f184f 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_british/_opposite_sex.erb
@@ -27,14 +27,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_local/_opposite_sex.erb
index 86735fc1919..3ca99fae3db 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_local/_opposite_sex.erb
@@ -27,14 +27,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_other/_opposite_sex.erb
index ba543c83cdb..5369f6f184f 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/ceremony_country/partner_other/_opposite_sex.erb
@@ -27,14 +27,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_british/_opposite_sex.erb
index 5a2722b4f5c..a05a1c65069 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_british/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_local/_opposite_sex.erb
index 4271b67e5e8..e222c5ade82 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_local/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_other/_opposite_sex.erb
index 5a2722b4f5c..a05a1c65069 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/third_country/partner_other/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_british/_opposite_sex.erb
index a9207c30507..e4b37822011 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_british/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_local/_opposite_sex.erb
index c1bfb430df0..7a8b99e702f 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_local/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_other/_opposite_sex.erb
index a9207c30507..e4b37822011 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/morocco/uk/partner_other/_opposite_sex.erb
@@ -29,14 +29,14 @@ If you’ve been divorced or widowed, you’ll need to provide:
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Morocco](/government/publications/morocco-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
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
new file mode 100644
index 00000000000..83b3850dc5d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage and civil partnership in Mozambique
+ <% else %>
+ Marriage in Mozambique
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.govspeak.erb
deleted file mode 100644
index 2e20f50ea6b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage and civil partnership in Mozambique
- <% else %>
- Marriage in Mozambique
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/myanmar/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/namibia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nauru/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..4880a28cf6e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,58 @@
+Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 40559c80ca0..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..a08fc48b80c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index ab611c8b341..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..a08fc48b80c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index ab611c8b341..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in Nepal to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Nepal. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Nepal for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Kathmandu.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-kathmandu/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Nepal.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nepal](/government/publications/nepal-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nepal/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/netherlands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.erb
new file mode 100644
index 00000000000..dc7c4579c7b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.erb
@@ -0,0 +1,48 @@
+New Caledonia is an overseas department or territory of France. The rules and requirements for PACS there are similar to France.
+
+Contact the [’tribunal d’instance’](http://www.annuaires.justice.gouv.fr/annuaires-12162/annuaire-des-tribunaux-dinstance-21775.html) in the town where you’re entering into a PACS to find out about local laws, including what documents you’ll need.
+
+If you’re not in France, [your closest French embassy](http://www.mfe.org/index.php/Annuaires/Ambassades-et-consulats-francais-a-l-etranger) may also be able to give you advice, or put you in touch with the relevant local authorities.
+
+^You should [get legal advice](/government/publications/france-list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide a certificate of custom (‘certificat de coutume’) if you’re entering into a PACS in New Caledonia.
+
+You should check with the tribunal d’instance to find out if you need one.
+
+If you need a certificate of custom, you can get one from the [British Embassy in Paris](/government/world/organisations/british-embassy-paris).
+
+Some tribunals only accept a certificate of custom dated less than 6 months before the date of your PACS. You should check with them before you apply. If your certificate is refused because you applied too early, you will need to apply and pay again.
+
+###Applying for a certificate of custom from the British Embassy
+
+s1. Download the [certificate of custom application form](/government/publications/application-form-for-certificate-of-custom-law-for-pacs-france)
+s2. Make sure you’ve got all of the supporting documents you need - there’s a checklist on the form.
+s3. You’ll need to include a pre-paid self-addressed envelope and a registered letter slip (‘récépissé d’un envoi recommandé sans avis de réception’) with your name and address, or a €6.55 postage fee, if you want your documents to be returned.
+s4. Send your completed form to the British Embassy with your supporting documents and the correct fee. You’ll have to pay in euros, as instructed on the payment slip attached to the form. See fee 11 on [consular fees for France](/government/publications/france-consular-fees) for the current cost. Send your application by registered post if you want confirmation of delivery.
+s5. The embassy will send your certificate and documents about 2 weeks after receiving your application. Certificates are issued in French and don’t need to be legalised.
+
+^If you both need a certificate of custom, you can apply together, but each partner must provide a completed application form and supporting documents. You’ll have to pay 2 fees but only one return postage fee.^
+
+###The certificate of celibacy
+
+The tribunal might also ask you for a certificate of celibacy (‘certificat de célibat’) to prove you’re not already married or in a civil partnership. It’s not possible to provide this under UK law, so you’ll need to download the explanatory note and take this to the tribunal instead.
+
+$D
+[Download ‘Explanatory note in lieu of a certificate of celibacy’](/government/publications/france-explanatory-note-in-lieu-of-certificat-celibat)
+$D
+
+##Naturalisation of your foreign partner if they move to the UK
+
+If your partner isn’t British, they can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+*[PACS]:pacte civil de solidarité
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.govspeak.erb
deleted file mode 100644
index c8d39bc3200..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_pacs.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-New Caledonia is an overseas department or territory of France. The rules and requirements for PACS there are similar to France.
-
-Contact the [’tribunal d’instance’](http://www.annuaires.justice.gouv.fr/annuaires-12162/annuaire-des-tribunaux-dinstance-21775.html) in the town where you’re entering into a PACS to find out about local laws, including what documents you’ll need.
-
-If you’re not in France, [your closest French embassy](http://www.mfe.org/index.php/Annuaires/Ambassades-et-consulats-francais-a-l-etranger) may also be able to give you advice, or put you in touch with the relevant local authorities.
-
-^You should [get legal advice](/government/publications/france-list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide a certificate of custom (‘certificat de coutume’) if you’re entering into a PACS in New Caledonia.
-
-You should check with the tribunal d’instance to find out if you need one.
-
-If you need a certificate of custom, you can get one from the [British Embassy in Paris](/government/world/organisations/british-embassy-paris).
-
-Some tribunals only accept a certificate of custom dated less than 6 months before the date of your PACS. You should check with them before you apply. If your certificate is refused because you applied too early, you will need to apply and pay again.
-
-###Applying for a certificate of custom from the British Embassy
-
-s1. Download the [certificate of custom application form](/government/publications/application-form-for-certificate-of-custom-law-for-pacs-france)
-s2. Make sure you’ve got all of the supporting documents you need - there’s a checklist on the form.
-s3. You’ll need to include a pre-paid self-addressed envelope and a registered letter slip (‘récépissé d’un envoi recommandé sans avis de réception’) with your name and address, or a €6.55 postage fee, if you want your documents to be returned.
-s4. Send your completed form to the British Embassy with your supporting documents and the correct fee. You’ll have to pay in euros, as instructed on the payment slip attached to the form. See fee 11 on [consular fees for France](/government/publications/france-consular-fees) for the current cost. Send your application by registered post if you want confirmation of delivery.
-s5. The embassy will send your certificate and documents about 2 weeks after receiving your application. Certificates are issued in French and don’t need to be legalised.
-
-^If you both need a certificate of custom, you can apply together, but each partner must provide a completed application form and supporting documents. You’ll have to pay 2 fees but only one return postage fee.^
-
-###The certificate of celibacy
-
-The tribunal might also ask you for a certificate of celibacy (‘certificat de célibat’) to prove you’re not already married or in a civil partnership. It’s not possible to provide this under UK law, so you’ll need to download the explanatory note and take this to the tribunal instead.
-
-$D
-[Download ‘Explanatory note in lieu of a certificate of celibacy’](/government/publications/france-explanatory-note-in-lieu-of-certificat-celibat)
-$D
-
-##Naturalisation of your foreign partner if they move to the UK
-
-If your partner isn’t British, they can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-*[PACS]:pacte civil de solidarité
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-caledonia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/new-zealand/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_british/_same_sex.erb
index 154ef7eeb36..b4e7c4d03db 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_british/_same_sex.erb
@@ -51,14 +51,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nicaragua](/government/publications/nicaragua-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_local/_same_sex.erb
index 7bad1d61914..89ed7319c7d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_local/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_other/_same_sex.erb
index 7bad1d61914..89ed7319c7d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/ceremony_country/partner_other/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_british/_same_sex.erb
index 154ef7eeb36..b4e7c4d03db 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_british/_same_sex.erb
@@ -51,14 +51,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nicaragua](/government/publications/nicaragua-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_local/_same_sex.erb
index 7bad1d61914..89ed7319c7d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_local/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_other/_same_sex.erb
index 7bad1d61914..89ed7319c7d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/third_country/partner_other/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_british/_same_sex.erb
index 154ef7eeb36..b4e7c4d03db 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_british/_same_sex.erb
@@ -51,14 +51,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Nicaragua](/government/publications/nicaragua-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_local/_same_sex.erb
index 2f1203e7f84..13c5f1c14e8 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_local/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_other/_same_sex.erb
index 7bad1d61914..89ed7319c7d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nicaragua/uk/partner_other/_same_sex.erb
@@ -51,7 +51,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/niger/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/nigeria/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-korea/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..b563ac5d202
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,58 @@
+Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
+
+%You can’t book an appointment to get advice at the embassy in person.%
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4bb131dd8a6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
-
-%You can’t book an appointment to get advice at the embassy in person.%
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..313c8ec3be6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
+
+%You can’t book an appointment to get advice at the embassy in person.%
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 687f0cbfa3c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
-
-%You can’t book an appointment to get advice at the embassy in person.%
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..313c8ec3be6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,60 @@
+Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
+
+%You can’t book an appointment to get advice at the embassy in person.%
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 687f0cbfa3c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-Contact the relevant local authorities in North Macedonia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You’ll need to have been living in North Macedonia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the [British Embassy in North Macedonia](/world/organisations/british-embassy-skopje#contact-us) or a notary public to get advice.
-
-%You can’t book an appointment to get advice at the embassy in person.%
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in North Macedonia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for North Macedonia](/government/publications/north-macedonia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/north-macedonia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..fbd49ebb1df
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+
+Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9f41fb55239..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..6fe4137d171
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 4d9d0540e44..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..c866afdd49d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3bb14bef5b9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..f708cf1351a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 74d7547888a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..c866afdd49d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3bb14bef5b9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Norway to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..f708cf1351a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 74d7547888a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..c30a75c9b1e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 78597008be0..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..eafc2b1533a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 705e60a07c5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..eafc2b1533a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 705e60a07c5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the relevant local authorities in Norway to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..160f789f7cc
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,37 @@
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
+
+^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
+
+###Legalisation and translation
+
+You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
+
+You should also check if it needs to be:
+
+- ‘[legalised](/get-document-legalised)’ (certified as genuine)
+- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
+
+You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index b70d8554beb..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
-
-^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
-
-###Legalisation and translation
-
-You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
-
-You should also check if it needs to be:
-
-- ‘[legalised](/get-document-legalised)’ (certified as genuine)
-- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
-
-You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..157afac674e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 678a7a3f4e8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..7cbaef63030
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,41 @@
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
+
+^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
+
+###Legalisation and translation
+
+You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
+
+You should also check if it needs to be:
+
+- ‘[legalised](/get-document-legalised)’ (certified as genuine)
+- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
+
+You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8f603b06b0e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
-
-^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
-
-###Legalisation and translation
-
-You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
-
-You should also check if it needs to be:
-
-- ‘[legalised](/get-document-legalised)’ (certified as genuine)
-- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
-
-You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..c5fc5adeed0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 5d0d81bf5ec..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..7cbaef63030
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,41 @@
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
+
+^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
+
+###Legalisation and translation
+
+You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
+
+You should also check if it needs to be:
+
+- ‘[legalised](/get-document-legalised)’ (certified as genuine)
+- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
+
+You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8f603b06b0e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-You can normally get a CNI by giving a notice of marriage at your local register office or registrar in the UK. Find your local office or registrar in [England and Wales](https://www.gov.uk/register-offices), [Scotland](http://www.nrscotland.gov.uk/files/registration/reglist.pdf), [Northern Ireland](http://www.nidirect.gov.uk/index/information-and-services/government-citizens-and-rights/births-and-registration/district-registrars-in-northern-ireland.htm), [Isle of Man](http://www.gov.im/registries/general/civilregistry), [Jersey](http://www.gov.je/pages/contacts.aspx?contactId=71) or [Guernsey](http://www.guernseyroyalcourt.gg/article/1663/Contact-Us).
-
-^A CNI issued in Scotland is valid for 3 months. A CNI issued in England, Wales or Northern Ireland will not expire. Check with your local register office to find out how long a CNI is valid if you live in the Channel Islands or the Isle of Man. You should also check with the local authorities in Norway to find out how long a CNI is valid under local law.^
-
-###Legalisation and translation
-
-You might need to exchange your UK-issued CNI for one that’s valid in Norway at the nearest embassy or consulate to where you’re getting married.
-
-You should also check if it needs to be:
-
-- ‘[legalised](/get-document-legalised)’ (certified as genuine)
-- translated - [find a translator abroad](/government/collections/list-of-lawyers), or in the UK through the [Institute of Linguists](http://www.ciol.org.uk)
-
-You should also check with the local authorities in Norway to find out if you need to provide legalised and translated copies of any other documents.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..c5fc5adeed0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrert partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
+
+[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
+
+^Your partner will need to get an affirmation as well.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
+- a civil partnership dissolution or annulment certificate
+- evidence if you’ve changed your name by deed poll
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
+
+You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 5d0d81bf5ec..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/norway/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-Same-sex relationships in Norway that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrert partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Norway](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Norway](/foreign-travel-advice/norway) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Oslo to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, a copy of your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Oslo.](https://www.consular-appointments.service.gov.uk/fco#!/british-embassy-oslo/oaths-affirmations-and-affidavits/slot_picker)
-
-^Your partner will need to get an affirmation as well.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced, widowed or previously in a civil partnership, you’ll need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate)
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-- a civil partnership dissolution or annulment certificate
-- evidence if you’ve changed your name by deed poll
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Norway](/government/publications/norway-consular-fees).
-
-You can pay by credit card (Visa, Visa Electron or MasterCard), but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_british/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_british/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_local/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_local/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_other/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/ceremony_country/partner_other/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_british/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_british/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_local/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_local/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_other/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/third_country/partner_other/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_british/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_british/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_local/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_local/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_other/_opposite_sex.erb
index 7487f6b1117..c6eda1be9ad 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/oman/uk/partner_other/_opposite_sex.erb
@@ -38,14 +38,14 @@ If you cannot get married at a church, mosque or temple, you may be able to get
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Oman](/government/publications/oman-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pakistan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/palau/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_opposite_sex.erb
index d248dd394da..b7ff9073a16 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_opposite_sex.erb
@@ -46,14 +46,14 @@ You should check if your CNI needs to be legalised (certified as genuine) by the
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_same_sex.erb
index f56ff0582d9..51e97a463b4 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_british/_same_sex.erb
@@ -44,7 +44,7 @@ You’ll need to provide two witnesses and pay a fee to register your civil part
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_opposite_sex.erb
index bd1abf2f658..1f9fbaaf8ce 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_opposite_sex.erb
@@ -48,14 +48,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_same_sex.erb
index 510ea5d859e..bbdc3f5c71e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_local/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_opposite_sex.erb
index bd1abf2f658..1f9fbaaf8ce 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_opposite_sex.erb
@@ -48,14 +48,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_same_sex.erb
index 510ea5d859e..bbdc3f5c71e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/ceremony_country/partner_other/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_british/_same_sex.erb
index d48445850d1..96a08196ba5 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_british/_same_sex.erb
@@ -44,7 +44,7 @@ You’ll need to provide two witnesses and pay a fee to register your civil part
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_local/_same_sex.erb
index d95cc565dc7..8cfdc7a8d85 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_local/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_other/_same_sex.erb
index 510ea5d859e..bbdc3f5c71e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/third_country/partner_other/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_british/_same_sex.erb
index cf5e6d0cb5b..3109ad5d82a 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_british/_same_sex.erb
@@ -44,7 +44,7 @@ You’ll need to provide two witnesses and pay a fee to register your civil part
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_local/_same_sex.erb
index 510ea5d859e..bbdc3f5c71e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_local/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_local/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_other/_same_sex.erb
index 510ea5d859e..bbdc3f5c71e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_other/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/panama/uk/partner_other/_same_sex.erb
@@ -55,7 +55,7 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
+<%= render partial: 'consular_fees_table_items', collection: calculator.services, as: :service, locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Panama](/government/publications/panama-consular-fees).
You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/papua-new-guinea/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/paraguay/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..a9871120132
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 12ffcffd22a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a18b60f03f6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cbc9b6a93ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..82bba7be663
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 5cc3f055ecd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..82bba7be663
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 5cc3f055ecd..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..4ea6b7f35ef
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 356f02713e5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a18b60f03f6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cbc9b6a93ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..031c20944d9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index e63a03d6e34..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..031c20944d9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index e63a03d6e34..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the relevant local authorities in Peru to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..b98d60e88d0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,41 @@
+
+Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index eb5a462fca9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..a18b60f03f6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cbc9b6a93ab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..6602ebba8af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index ee33e37d30c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..6602ebba8af
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,45 @@
+
+Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index ee33e37d30c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Contact the [Embassy of Peru](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Peru](/foreign-travel-advice/peru) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Peru to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-marriage-in-peru-spanish-only) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance. You must take the form with you to your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3682f5e19f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.erb
@@ -0,0 +1,44 @@
+You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
+
+[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index d4db9345ae9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/peru/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-You may be able to register a civil partnership or get married at the British embassy or consulate in Peru.
-
-[Make an appointment at the embassy in Lima.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-lima/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Peru for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry or enter into a civil partnership
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage or civil partnership and a fee for your marriage or civil partnership certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Peru](/government/publications/peru-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_same_sex.erb
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
new file mode 100644
index 00000000000..17e1e6809f2
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in the Philippines
+ <% else %>
+ Marriage in the Philippines
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.govspeak.erb
deleted file mode 100644
index 746f36c7c9f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in the Philippines
- <% else %>
- Marriage in the Philippines
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/pitcairn-island/uk/partner_other/_same_sex.erb
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
new file mode 100644
index 00000000000..7abc5067ad3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage and civil partnership in Poland
+ <% else %>
+ Marriage in Poland
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.govspeak.erb
deleted file mode 100644
index 845c726df13..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage and civil partnership in Poland
- <% else %>
- Marriage in Poland
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/ceremony_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/third_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/uk/_same_sex.erb
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
new file mode 100644
index 00000000000..574477d4833
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in Portugal
+ <% else %>
+ Marriage in Portugal
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.govspeak.erb
deleted file mode 100644
index b5d2b015947..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in Portugal
- <% else %>
- Marriage in Portugal
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_british/_opposite_sex.erb
index 79347cb0840..d44d7dd1338 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_british/_opposite_sex.erb
@@ -43,12 +43,12 @@ Contact the [British embassy in Qatar](/world/organisations/british-embassy-doha
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_local/_opposite_sex.erb
index 8baa455a471..4b6804896e6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_local/_opposite_sex.erb
@@ -47,12 +47,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_other/_opposite_sex.erb
index 8baa455a471..4b6804896e6 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/ceremony_country/partner_other/_opposite_sex.erb
@@ -47,12 +47,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_british/_opposite_sex.erb
index 9611675b424..68fbe634a60 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_british/_opposite_sex.erb
@@ -37,12 +37,12 @@ You’ll need to get your affirmation or affidavit [translated](/government/coll
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_local/_opposite_sex.erb
index ca7e6a1be2b..f68f8b655c5 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_local/_opposite_sex.erb
@@ -41,12 +41,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_other/_opposite_sex.erb
index ca7e6a1be2b..f68f8b655c5 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/third_country/partner_other/_opposite_sex.erb
@@ -41,12 +41,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_british/_opposite_sex.erb
index ca7974f4ba5..e7909c8eca8 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_british/_opposite_sex.erb
@@ -33,12 +33,12 @@ You’ll need to get your affirmation or affidavit [translated](/government/coll
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_local/_opposite_sex.erb
index fe795ff7bd6..03b911a5a2e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_local/_opposite_sex.erb
@@ -37,12 +37,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_other/_opposite_sex.erb
index fe795ff7bd6..03b911a5a2e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/qatar/uk/partner_other/_opposite_sex.erb
@@ -37,12 +37,12 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Qatar](/government/publications/qatar-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_reunion.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_reunion.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_reunion.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_reunion.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/reunion/_title.erb
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
new file mode 100644
index 00000000000..7d5090460a7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.erb
@@ -0,0 +1,10 @@
+<% 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
+ <% elsif calculator.partner_is_same_sex? %>
+ Same-sex marriage in Romania
+ <% else %>
+ Marriage in Romania
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.govspeak.erb
deleted file mode 100644
index e828b21046e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? &&
- calculator.partner_is_national_of_ceremony_country? %>
- Same-sex marriage and civil partnership in Romania
- <% elsif calculator.partner_is_same_sex? %>
- Same-sex marriage in Romania
- <% else %>
- Marriage in Romania
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..8c3fe475232
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,76 @@
+Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
+
+You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###Post notice at the British Embassy
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+###Post notice in front of a notary public
+
+You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
+
+You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
+
+Check with the notary if they want electronic copies of the forms before your appointment.
+
+Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
+
+$A
+British Embassy
+Strada Jules Michelet 24
+Bucuresti 010463
+$A
+
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 2cc391dbf09..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
-
-You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###Post notice at the British Embassy
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-###Post notice in front of a notary public
-
-You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
-
-You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
-
-Check with the notary if they want electronic copies of the forms before your appointment.
-
-Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
-
-$A
-British Embassy
-Strada Jules Michelet 24
-Bucuresti 010463
-$A
-
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..80d7e1da705
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cf5178a7736..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..fe58bd4c7a9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,80 @@
+Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
+
+You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###Post notice at the British Embassy
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+###Post notice in front of a notary public
+
+You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
+
+You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
+
+Check with the notary if they want electronic copies of the forms before your appointment.
+
+Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
+
+$A
+British Embassy
+Strada Jules Michelet 24
+Bucuresti 010463
+$A
+
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 210d0b6ca9f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
-
-You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###Post notice at the British Embassy
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-###Post notice in front of a notary public
-
-You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
-
-You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
-
-Check with the notary if they want electronic copies of the forms before your appointment.
-
-Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
-
-$A
-British Embassy
-Strada Jules Michelet 24
-Bucuresti 010463
-$A
-
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..fe58bd4c7a9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,80 @@
+Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
+
+You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###Post notice at the British Embassy
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+###Post notice in front of a notary public
+
+You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
+
+You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
+
+Check with the notary if they want electronic copies of the forms before your appointment.
+
+Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
+
+$A
+British Embassy
+Strada Jules Michelet 24
+Bucuresti 010463
+$A
+
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 210d0b6ca9f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-Contact the relevant local authorities in Romania to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI you must post notice of your intended marriage in Romania. You can do this at the British embassy or have your notice of marriage and affidavit for marriage witnessed in front of a notary public.
-
-You’ll need to have been living in Romania for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###Post notice at the British Embassy
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-###Post notice in front of a notary public
-
-You can have your notice of marriage and affidavit for marriage witnessed by a [Romanian notary public](http://www.notaries-directory.eu/) instead. You’ll have to pay a fee.
-
-You’ll need to download a [certificate of no impediment application pack](/government/publications/certificate-of-no-impediment-application-pack-romania). Don’t fill in or sign the forms before your appointment.
-
-Check with the notary if they want electronic copies of the forms before your appointment.
-
-Complete and sign the forms in front of the notary. Then send the signed documents and supporting documents to the embassy.
-
-$A
-British Embassy
-Strada Jules Michelet 24
-Bucuresti 010463
-$A
-
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Romania.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3cb082557fd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index b0cde26573d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..80d7e1da705
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cf5178a7736..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3cb082557fd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index b0cde26573d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..80d7e1da705
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.erb
@@ -0,0 +1,42 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index cf5178a7736..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3cb082557fd
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.erb
@@ -0,0 +1,46 @@
+
+You may be able to get married at the British embassy or consulate in Romania.
+
+[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index b0cde26573d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-
-You may be able to get married at the British embassy or consulate in Romania.
-
-[Make an appointment at the embassy in Bucharest.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bucharest/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Romania for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married or enter into a civil partnership up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Romania](/government/publications/romania-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_opposite_sex.erb
index 06f1c76e933..b7e0be72064 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_opposite_sex.erb
@@ -60,14 +60,14 @@ You need to get your CNI [certified by the Russian Ministry of Foreign Affairs L
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_same_sex.erb
index b8dd49f1b24..b760e1b235e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_british/_same_sex.erb
@@ -56,14 +56,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
##Convert a civil partnership to a same-sex marriage
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_local/_opposite_sex.erb
index 2470dcfd154..39072a49004 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_local/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_local/_opposite_sex.erb
@@ -62,14 +62,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_other/_opposite_sex.erb
index 3564269e00b..55adce5ed4f 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_other/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/ceremony_country/partner_other/_opposite_sex.erb
@@ -63,14 +63,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/third_country/partner_british/_same_sex.erb
index b8dd49f1b24..b760e1b235e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/third_country/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/third_country/partner_british/_same_sex.erb
@@ -56,14 +56,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
##Convert a civil partnership to a same-sex marriage
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_british/_same_sex.erb
index b8dd49f1b24..b760e1b235e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_british/_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_british/_same_sex.erb
@@ -56,14 +56,14 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
## Fees
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
+<%= render partial: 'consular_fees_table_items',
collection: calculator.services,
as: :service,
locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Russia](/government/publications/russia-consular-fees).
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
##Convert a civil partnership to a same-sex marriage
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/rwanda/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saint-barthelemy/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/san-marino/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sao-tome-and-principe/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..297fa4061f7
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,38 @@
+One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
+
+##Getting married at the British Embassy
+
+^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
+
+[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide:
+
+- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
+- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
+- equivalent document for your partner
+
+If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What happens next
+
+Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
+
+You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 71efa9e65d7..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
-
-##Getting married at the British Embassy
-
-^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
-
-[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide:
-
-- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
-- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
-- equivalent document for your partner
-
-If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What happens next
-
-Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
-
-You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..6cb66d89b95
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,42 @@
+One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
+
+##Getting married at the British Embassy
+
+^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
+
+[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide:
+
+- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
+- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
+- equivalent document for your partner
+
+If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What happens next
+
+Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
+
+You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 31c74fae425..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
-
-##Getting married at the British Embassy
-
-^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
-
-[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide:
-
-- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
-- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
-- equivalent document for your partner
-
-If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What happens next
-
-Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
-
-You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..6cb66d89b95
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,42 @@
+One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
+
+##Getting married at the British Embassy
+
+^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
+
+[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide:
+
+- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
+- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
+- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
+- equivalent document for your partner
+
+If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What happens next
+
+Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
+
+You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 31c74fae425..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-One of you must be a Muslim to get married under local laws in Saudi Arabia. Contact the [Embassy of Saudi Arabia](http://www.saudiembassy.org.uk/) to find out about local marriage laws.
-
-##Getting married at the British Embassy
-
-^ You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim.^
-
-[Book an appointment at the British Embassy in Riyadh.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-riyadh/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide:
-
-- proof that you’ve been living in the country where you intend to get married for at least 21 days, e.g. an employer’s letter or a bank statement (you’ll also need to sign a declaration to confirm this)
-- your original passport and [full birth certificate](/order-copy-birth-death-marriage-certificate) or [naturalisation certificate](/get-replacement-citizenship-certificate)
-- proof that you’re both over the age of 16, not within prohibited degrees of relationship to each other, and there’s no other impediment to your proposed marriage
-- equivalent document for your partner
-
-If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What happens next
-
-Once you’ve submitted these and paid the registration fee (see below), the embassy or consulate will post your marriage notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the consular officer can then perform the marriage ceremony any time until 3 months after the date you gave notice.
-
-You’ll need to pay additional fees for the marriage ceremony and to get your marriage certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Saudi Arabia](/government/publications/saudi-arabia-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/saudi-arabia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/senegal/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..2e42fe51d68
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8017289d339..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..ea9883a6979
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 4a8a498aead..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..7840c826aca
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 13dd899ccf7..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..7840c826aca
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 13dd899ccf7..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Serbia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Serbia. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Serbia for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Serbia, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Serbia.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..ea9883a6979
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 4a8a498aead..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..ea9883a6979
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 4a8a498aead..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..76924da2b3d
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,48 @@
+You may be able to get married at the British embassy or consulate in Serbia.
+
+[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
+
+##What documents you’ll need
+
+You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
+
+You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+##What you need to do
+
+At your appointment the embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody registers an objection you can get married up to 3 months after you gave notice.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 46d8583bf5a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/serbia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-You may be able to get married at the British embassy or consulate in Serbia.
-
-[Make an appointment at the embassy in Belgrade.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-belgrade/notice-of-marriage-or-civil-partnership/slot_picker)
-
-##What documents you’ll need
-
-You need to have been living in Serbia for 21 days. You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter or a bank statement.
-
-You’ll both need to bring your original passports. You’ll also need evidence that your partner is free to marry - a document from their government or their passport that says they are unmarried. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need to provide:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-##What you need to do
-
-At your appointment the embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody registers an objection you can get married up to 3 months after you gave notice.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage certificate.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Serbia](/government/publications/serbia-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/seychelles/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sierra-leone/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/singapore/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovakia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..bff23a302a9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,34 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index c6796ca1662..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..8aa55010778
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,38 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 803fac203b1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..8aa55010778
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,38 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 803fac203b1..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..e49d314003c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,36 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index b6722662b47..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..896fcbdc46b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,40 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index c9eb865c899..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..896fcbdc46b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,40 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index c9eb865c899..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the relevant local authorities in Slovenia to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..fb55997fc88
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.erb
@@ -0,0 +1,36 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 9af8b4dc988..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..bccbdd57922
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.erb
@@ -0,0 +1,40 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 19e04e35f66..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..4739409c601
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,40 @@
+Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
+
+You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
+
+You can download and fill in (but not sign) the form in advance.
+
+You must take the form with you to your appointment.
+
+^Your partner will need to get an affirmation as well.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 61525d38c59..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Contact the relevant local authorities in Slovenia to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide an ‘affirmation for marriage’ document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in Slovenia to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Ljubljana.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ljubljana/oaths-affirmations-and-affidavits/slot_picker)
-
-You’ll need to complete an [affidavit form](/government/publications/affidavit-form-slovenia) to prove you’re allowed to marry.
-
-You can download and fill in (but not sign) the form in advance.
-
-You must take the form with you to your appointment.
-
-^Your partner will need to get an affirmation as well.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..bccbdd57922
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.erb
@@ -0,0 +1,40 @@
+Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
+
+Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+$A
+British Embassy
+Trg republike 3
+1000 Ljubljana
+Slovenia
+$A
+
+$C
+Telephone: +386 1 200 39 10
+Fax: +386 1 425 01 74
+
+[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
+$C
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
+
+^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 19e04e35f66..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/slovenia/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-Same-sex relationships in Slovenia that are recognised as civil partnerships under British law are known as ’istospolne partnerske skupnosti’, or ‘same-sex partnerships’.
-
-Contact the [Embassy of Slovenia](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Slovenia](/foreign-travel-advice/slovenia).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Slovenia.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-$A
-British Embassy
-Trg republike 3
-1000 Ljubljana
-Slovenia
-$A
-
-$C
-Telephone: +386 1 200 39 10
-Fax: +386 1 425 01 74
-
-[British Embassy - opening hours](https://www.gov.uk/world/organisations/british-embassy-ljubljana/office/british-embassy)
-$C
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Slovenia](/government/publications/slovenia-consular-fees).
-
-^You can only pay by cash in Slovenia. This must be in the local currency.^
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/solomon-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/somalia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-georgia-and-the-south-sandwich-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.erb
index 69d4aa87eb0..8be00a93121 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.erb
@@ -39,9 +39,10 @@ Your partner can apply to [become a British citizen](/becoming-a-british-citizen
##Fees
-Service | Fee
--|-
-Affidavit or affirmation for marriage | £50
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for South Korea](/government/publications/south-korea-consular-fees).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.govspeak.erb
deleted file mode 100644
index f03f69acf86..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-Contact the local relevant marriage authorities before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Korea](/foreign-travel-advice/south-korea) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in South Korea to swear an affidavit (written statement of facts) that you’re free to marry. You’ll need to bring your passport, your partner’s passport and pay a fee.
-
-[Make an appointment at the embassy in Seoul](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-seoul/oaths-affirmations-and-affidavits/slot_picker).
-
-You’ll need to fill in an [‘Affidavit for Marriage’](/government/publications/south-korea-affidavit-of-eligibility-for-marriage-form) form stating that you’re free to marry. You can download and fill in (but not sign) the form in advance. You’ll need to take the form with you to your appointment.
-
-###If your partner is South Korean
-
-You’ll need to provide supporting documents, including:
-
-- your partner’s Family Relationship Certificate and Marriage Status Certificate - these can be obtained from a local district office anywhere in South Korea and must be translated into English and notarised by a lawyer in Korea
-- your partner’s valid Korean ID card
-- your partner’s proof of termination of any prior marriage(s)
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and [‘legalised’](/get-document-legalised) (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or [death certificate](/order-copy-birth-death-marriage-certificate) - a [decree nisi](/divorce/apply-for-decree-nisi) won’t be accepted
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit or equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-##Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for South Korea](/government/publications/south-korea-consular-fees).
-
-You can pay by cash in the local currency or by credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_same_sex.govspeak.erb
deleted file mode 100644
index 1c0a33bd1f9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-##Before you start
-
-You can get married at the British Embassy in Seoul if you are marrying someone who is not a national of Korea.
-
-##Prove you’re free to get married
-
-You need to give notice of your marriage at the embassy. Your partner will also need to give notice if they’re British.
-
-You need to have been in South Korea for at least 7 full days before you can give notice. This means if you arrive on Monday, you can’t give notice until the following Tuesday.
-
-You both need to sign a declaration that you’re free to marry.
-
-###Give notice of your marriage
-
-Make an appointment to give notice of your marriage [at the embassy in Seoul](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-seoul/consular-marriage-or-civil-partnership/slot_picker).
-
-It costs £50 to give notice. You can pay in the [local currency](/government/publications/south-korea-consular-fees) with cash or credit card, but not by personal cheque.
-
-You need to bring your and your partner’s passports. Your passport must have an entry stamp showing that you’ve been in South Korea for at least 7 full days.
-
-If your partner isn’t British, you’ll need to bring their ‘single certificate’. They can get this from their embassy or consulate.
-
-If you or your partner have been married or in a civil partnership before, you’ll also need:
-
-- your [original decree absolute or final order](/copy-decree-absolute-final-order) (this could be a printed PDF and covering email from the court) - if you’re divorced
-- your annulment certificate - if your marriage or civil partnership was annulled
-- your civil partnership dissolution - if your civil partnership was dissolved
-- your partner’s [death certificate](/order-copy-birth-death-marriage-certificate) and marriage certificate - if you’ve been widowed
-
-^If your divorce, civil partnership dissolution or annulment took place outside the UK, you’ll need evidence that you or your ex partner lived in or were a national of that country at the time.^
-
-The embassy will display your notice publicly for 14 days. If nobody registers an objection, you can get married up to 3 months after the end of your notice period.
-
-Contact the [embassy in Seoul](/world/organisations/british-embassy-seoul#contact-us) to set a date for your wedding.
-
-###Sign a declaration
-
-You and your partner need to sign a declaration to say that you’re legally allowed to get married. You’ll do this at the embassy in Seoul on your wedding day.
-
-##Get married
-
-Your wedding ceremony will be at the embassy in Seoul on the date you agreed.
-
-You both need to bring your passports to show that you’ve been in South Korea for at least the last 21 full days.
-
-You’ll need to bring 2 witnesses to your ceremony. Your witnesses must:
-
-- bring photo ID
-- be 16 or over
-- know you or your partner
-- understand English well enough to follow the ceremony and read the marriage register
-
-You, your partner, your 2 witnesses and the consular officer will sign the marriage register.
-
-It costs £150 to register your marriage. You can also pay £50 for a marriage certificate if you want one.
-
-You’ll need to pay in the [local currency](/government/publications/south-korea-consular-fees) with cash or credit card before your wedding.
-
-##After you get married
-
-You’ll be married under UK law, so your marriage will be recognised in the UK but not in South Korea or other countries where same sex marriage isn’t legal.
-
-If your partner isn’t a British citizen, they can apply for [British citizenship](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-sudan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/ceremony_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/third_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/spain/uk/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sri-lanka/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-helena-ascension-and-tristan-da-cunha/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-kitts-and-nevis/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-lucia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-maarten/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-martin/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_st-pierre-and-miquelon.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_st-pierre-and-miquelon.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_st-pierre-and-miquelon.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_st-pierre-and-miquelon.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-pierre-and-miquelon/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/st-vincent-and-the-grenadines/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..3c3da2ad251
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,75 @@
+Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Khartoum
+off Sharia Al Baladia
+PO Box No 801, Khartoum East
+Khartoum
+Sudan
+$A
+
+$C
+Telephone: +249 (0)156 775500
+Fax: +249 (0)156 775501
+
+Email:
+
+[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index accf1afc668..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Khartoum
-off Sharia Al Baladia
-PO Box No 801, Khartoum East
-Khartoum
-Sudan
-$A
-
-$C
-Telephone: +249 (0)156 775500
-Fax: +249 (0)156 775501
-
-Email:
-
-[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..6a28b36117e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,77 @@
+Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Khartoum
+off Sharia Al Baladia
+PO Box No 801, Khartoum East
+Khartoum
+Sudan
+$A
+
+$C
+Telephone: +249 (0)156 775500
+Fax: +249 (0)156 775501
+
+Email:
+
+[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index b25991f1050..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,77 +0,0 @@
-Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Khartoum
-off Sharia Al Baladia
-PO Box No 801, Khartoum East
-Khartoum
-Sudan
-$A
-
-$C
-Telephone: +249 (0)156 775500
-Fax: +249 (0)156 775501
-
-Email:
-
-[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..6a28b36117e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,77 @@
+Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+Contact the embassy or consulate to make an appointment.
+
+$A
+British Embassy Khartoum
+off Sharia Al Baladia
+PO Box No 801, Khartoum East
+Khartoum
+Sudan
+$A
+
+$C
+Telephone: +249 (0)156 775500
+Fax: +249 (0)156 775501
+
+Email:
+
+[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
+$C
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index b25991f1050..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,77 +0,0 @@
-Contact the relevant local authorities in Sudan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Sudan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Sudan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-Contact the embassy or consulate to make an appointment.
-
-$A
-British Embassy Khartoum
-off Sharia Al Baladia
-PO Box No 801, Khartoum East
-Khartoum
-Sudan
-$A
-
-$C
-Telephone: +249 (0)156 775500
-Fax: +249 (0)156 775501
-
-Email:
-
-[British Embassy Khartoum - opening hours](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact)
-$C
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy will charge a fee for taking the oath, and then display your notice of marriage publicly for a further 7 days. They’ll then issue the CNI, as long as nobody has registered an objection. There’s an additional fee for this.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Sudan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sudan](/government/publications/sudan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sudan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/suriname/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..0f1c40607dc
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,81 @@
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 76c0a134cce..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..f09ad98bceb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,87 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’
+
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 6883c6b9ad8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’
-
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..0f1c40607dc
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,81 @@
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 76c0a134cce..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..068818d23c9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,90 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’
+
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index b27493c4616..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’
-
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..24cf8b07c57
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,78 @@
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 1d085fd76b9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,78 +0,0 @@
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days, from the day after they receive your payment.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..7bb3d6dc1ce
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,90 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’
+
+Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
+
+If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
+
+To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
+
+You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
+
+You can download and fill in (but not sign) the forms in advance.
+
+###Posting notice at the embassy
+
+[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
+
+To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy to find out what you need
+- equivalent documents for your partner
+
+You’ll also need the correct fees.
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+##What happens next
+
+The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
+
+If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
+
+$A
+British Embassy
+Consular Section
+Box 27819
+115 93 Stockholm
+$A
+
+Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
+
+As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
+
+After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 4b038b5d084..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’
-
-Contact the [Swedish Tax Authorities](http://www.skatteverket.se/servicelankar/otherlanguages/inenglish/contactus.4.4c5def2714bbf25766d2d6f.html) to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-If you aren’t registered in the Swedish population register you’ll need to provide proof of marital status. A certificate of no impediment (CNI) will be required to prove you’re allowed to marry.
-
-If you aren’t registered in Sweden, you’ll also need to bring your partner’s extract from the population register as proof of address, or proof of address from the country that you’re living in.
-
-To get a CNI, you must post notice of your intended marriage in Sweden. You can do this at the British embassy.
-
-You’ll need to have been living in Sweden for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-You can have your [notice of marriage form](/government/publications/notice-of-marriage-form--2) and [oath or affirmation](/government/publications/affirmationaffidavit-of-marital-status-form) witnessed in front of a [local notary public](https://www.advokatsamfundet.se/Behover-du-advokat/Sok-advokat/Sokresultat/?areaoflaw=6801) or at the British embassy.
-
-You can download and fill in (but not sign) the forms in advance.
-
-###Posting notice at the embassy
-
-[Book an appointment for a CNI in Stockholm](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-stockholm/certificate-of-no-impediment/slot_picker).
-
-To give notice of intended marriage at the embassy, you can swear or affirm an oath. If you would like to swear an oath on a holy book (religious), you’ll need to bring your own holy book.
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy to find out what you need
-- equivalent documents for your partner
-
-You’ll also need the correct fees.
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-##What happens next
-
-The embassy or notary public can take your oath or affirmation and witness your notice of marriage. The notary public may charge 2 separate fees for this.
-
-If a notary public witnesses your documents, you must post the signed forms and any supporting documents to the British embassy in Stockholm afterwards, along with the [credit card payment authorisation form](/government/publications/creditdebit-card-payment-authorisation-slip-sweden) to:
-
-$A
-British Embassy
-Consular Section
-Box 27819
-115 93 Stockholm
-$A
-
-Once you’ve posted your notice and paid the registration fee, the embassy or consulate will display your notice of marriage publicly for 7 days.
-
-As long as nobody registers an objection, the embassy you will give you a CNI on the 8th day. You don’t need to stay in the country while your notice is posted.
-
-After you receive your CNI, you need to take it to the [Swedish tax authorities](http://www.skatteverket.se/privat.4.76a43be412206334b89800052864.html) to be registered.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..5a82bceff98
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,29 @@
+Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
+- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
+
+%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 14c4d1e6d34..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
-- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
-
-%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..174027c4a48
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,33 @@
+Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
+- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
+
+%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index 65069f98491..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
-- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
-
-%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..174027c4a48
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,33 @@
+Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+There are 2 ways you can get a CNI:
+
+- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
+- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
+
+%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 65069f98491..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-Contact the relevant local authorities in Sweden to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-There are 2 ways you can get a CNI:
-
-- [go to the UK and post notice with a UK registrar](https://www.gov.uk/marriage-abroad/y/sweden/uk/partner_local/same_sex)
-- [go to Sweden and post notice at the embassy or consulate there](https://www.gov.uk/marriage-abroad/y/sweden/ceremony_country/partner_local/same_sex)
-
-%If you choose to post notice in Sweden, you’ll normally have to wait at least 13 days for your CNI. It can take longer depending on the local authorities’ processes and the time of year.%
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..e371241ed9b
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.erb
@@ -0,0 +1,32 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+<%= render partial: 'shared/overseas_passports_embassies',
+ locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 2fec51c0bc6..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-<%= render partial: 'shared/overseas_passports_embassies.govspeak.erb',
- locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..3efeea3f792
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.erb
@@ -0,0 +1,36 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+<%= render partial: 'shared/overseas_passports_embassies',
+ locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index e51dfbe13b2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-<%= render partial: 'shared/overseas_passports_embassies.govspeak.erb',
- locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..3efeea3f792
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.erb
@@ -0,0 +1,36 @@
+Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
+
+- marriage
+- ’registrerat partnerskap’, or ’registered partnership’.
+
+Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
+
+You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
+
+Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
+
+<%= render partial: 'shared/overseas_passports_embassies',
+ locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+
+
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index e51dfbe13b2..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/sweden/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-Same-sex relationships in Sweden that are recognised as civil partnerships under British law are known as:
-
-- marriage
-- ’registrerat partnerskap’, or ’registered partnership’.
-
-Contact the [Embassy of Sweden](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local laws, including what documents you’ll need.
-
-You should also check the [travel advice for Sweden](/foreign-travel-advice/sweden).
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to enter into a civil partnership or equivalent in Sweden.
-
-Contact the local British embassy or consulate where you’re planning the ceremony to find out what you need to do.
-
-<%= render partial: 'shared/overseas_passports_embassies.govspeak.erb',
- locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Sweden](/government/publications/sweden-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-
-
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/ceremony_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/third_country/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/switzerland/uk/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/syria/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/taiwan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..03090daab6c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index e9a721b8c1f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..fc23401c572
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4ea42584663..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..fc23401c572
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4ea42584663..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Tajikistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Tajikistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Tajikistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Dushanbe.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Tajikistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Tajikistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Tajikistan](/government/publications/tajikistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tajikistan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tanzania/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_same_sex.erb
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
new file mode 100644
index 00000000000..8b1d0c119e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage and civil partnership in Thailand
+ <% else %>
+ Marriage in Thailand
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.govspeak.erb
deleted file mode 100644
index 05ad2e6752f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage and civil partnership in Thailand
- <% else %>
- Marriage in Thailand
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/the-gambia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/timor-leste/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/togo/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tonga/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/trinidad-and-tobago/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tunisia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_same_sex.erb
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
new file mode 100644
index 00000000000..352db739f29
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in Turkey
+ <% else %>
+ Marriage in Turkey
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.govspeak.erb
deleted file mode 100644
index dcb6579b085..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in Turkey
- <% else %>
- Marriage in Turkey
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..dcfd7c0ccc0
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 13e5b21fc6a..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..3121dc33be5
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 59dbae11cea..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..3121dc33be5
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 59dbae11cea..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Turkmenistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Turkmenistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Turkmenistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Ashgabat.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Turkmenistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Turkmenistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Turkmenistan](/government/publications/turkmenistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkmenistan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/turks-and-caicos-islands/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/tuvalu/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uganda/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uganda/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uganda/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uganda/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/ukraine/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..74f37091b6c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,64 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
+
+Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 7f88b2c68c8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
-
-Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..05c6eb2944c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,68 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
+
+Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9cfc37c71e5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
-
-Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..05c6eb2944c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,68 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
+
+Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 9cfc37c71e5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-You may be able to get married at the British Embassy in Dubai if you’re both resident in the United Arab Emirates and can prove that there are no other suitable facilities to get married locally.
-
-Contact the [British Embassy in Dubai](/government/world/organisations/british-embassy-dubai) for more information.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..c36f064dbb3
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,60 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 51e442bd923..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..850071c65fe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,64 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 974c7cf0801..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..850071c65fe
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,64 @@
+
+Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 974c7cf0801..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Contact the relevant local authorities in the United Arab Emirates to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..3442ac0cda6
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,60 @@
+
+Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 62000b4b80b..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..f757923c166
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,64 @@
+
+Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 63cbc8c7719..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..f757923c166
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,64 @@
+
+Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
+
+^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
+
+You can only get married in the United Arab Emirates if you or your partner are resident there.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
+
+[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
+
+[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
+
+^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
+
+You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
+
+You can download and fill in (but not sign) the form in advance.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+### What you need to take
+
+You’ll need to take all of the following to your appointment:
+
+- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
+- your passport and UAE residency or entry visa
+- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
+- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
+
+^A marriage affirmation or affidavit is valid for 3 months.^
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
+
+You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 63cbc8c7719..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Contact the [Embassy of the United Arab Emirates](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for the United Arab Emirates](/foreign-travel-advice/united-arab-emirates) before making any plans.
-
-^There are no civil marriages in the United Arab Emirates, but you can get married through a religious ceremony at a church or Sharia court.^
-
-You can only get married in the United Arab Emirates if you or your partner are resident there.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy or consulate in the United Arab Emirates to swear an affirmation or affidavit that you’re free to marry. You’ll need to bring your passport and pay a fee.
-
-[Make an appointment at the embassy in Dubai.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dubai/oaths-affirmations-and-affidavits/slot_picker)
-
-[Make an appointment at the embassy in Abu Dhabi.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-abu-dhabi/oaths-affirmations-and-affidavits/slot_picker)
-
-^If you have dual nationality and you entered the United Arab Emirates on a non-British passport, you must contact the embassy of that country to get your affirmation or affidavit.^
-
-You’ll need to complete an [‘Affirmation for marriage’ (non-religious) or an ‘Affidavit for marriage’ (religious) form](/government/publications/affidavitaffirmatin-of-marital-status-forms-uae) in English.
-
-You can download and fill in (but not sign) the form in advance.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-### What you need to take
-
-You’ll need to take all of the following to your appointment:
-
-- your completed and typed affirmation or affidavit – you’ll be sent the form by email after booking your appointment
-- your passport and UAE residency or entry visa
-- the residency visa/UAE entry stamp in your partner’s passport if they’re resident in the United Arab Emirates
-- a copy of your partner’s passport or ID if they aren’t resident in the United Arab Emirates
-
-^A marriage affirmation or affidavit is valid for 3 months.^
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for the United Arab Emirates](/government/publications/united-arab-emirates-consular-fees).
-
-You can pay by cash or credit card, but not by personal cheque.
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/united-arab-emirates/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uruguay/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_same_sex.erb
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
new file mode 100644
index 00000000000..d20329e9d3e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in the USA
+ <% else %>
+ Marriage in the USA
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.govspeak.erb
deleted file mode 100644
index d5fc3e542f8..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in the USA
- <% else %>
- Marriage in the USA
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..9f295646009
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4b57c7ae4fc..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..21f2087f8fb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 75424a81796..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..21f2087f8fb
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 75424a81796..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Uzbekistan to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Uzbekistan. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Uzbekistan for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Tashkent.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Uzbekistan, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Uzbekistan.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Uzbekistan](/government/publications/uzbekistan-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/uzbekistan/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vanuatu/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..147dbce8424
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,68 @@
+Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+^Your partner will need to follow the same process and pay the fees to get their own CNI.^
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
+
+^You don't need to stay in the country while your notice is posted.^
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index df10fe73d83..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-^Your partner will need to follow the same process and pay the fees to get their own CNI.^
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
-
-^You don't need to stay in the country while your notice is posted.^
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..5a3c5c9f938
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 35adb765ee9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..468e85a50ca
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3de3a88d3d5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..468e85a50ca
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,70 @@
+Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
+
+To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
+
+You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
+
+[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
+
+You’ll need to provide supporting documents, including:
+
+- your passport
+- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
+- equivalent documents for your partner
+
+You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
+
+You can download and fill in (but not sign) the forms in advance.
+
+You must take the forms with you to your appointment.
+
+%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
+
+If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- a civil partnership dissolution or annulment certificate
+- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
+
+###What happens next
+
+The embassy or notary public will charge a fee for taking the oath.
+
+If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
+
+^The embassy or consulate may charge a fee to return your documents to you.^
+
+The consulate will display your notice of marriage publicly for 7 days.
+
+They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
+
+There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
+
+You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
+
+^You don't need to stay in the country while your notice is posted.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 3de3a88d3d5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-Contact the relevant local authorities in Venezuela to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide a certificate of no impediment (CNI) to prove you’re allowed to marry.
-
-To get a CNI, you must post notice of your intended marriage in Venezuela. You can do this at the British embassy or in front of a notary public.
-
-You’ll need to have been living in Venezuela for at least 3 full days before you can post notice, for example if you arrive in the country on Thursday, the earliest you can post notice is the following Monday.
-
-[Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
-
-You’ll need to provide supporting documents, including:
-
-- your passport
-- proof of residence, such as a residence certificate - check with the embassy or notary public to find out what you need
-- equivalent documents for your partner
-
-You’ll need to complete a [‘Notice of marriage’](/government/publications/notice-of-marriage-form--2) form and an [‘Affidavit for marriage’](/government/publications/affirmationaffidavit-of-marital-status-form) form.
-
-You can download and fill in (but not sign) the forms in advance.
-
-You must take the forms with you to your appointment.
-
-%The names on all documents you provide must appear exactly as they do on your passports - if not, the authorities may refuse to allow the marriage to go ahead. You may need to provide evidence if the name on your passport is different to your birth certificate (for example marriage certificate or deed poll).%
-
-If you or your partner have been divorced, widowed or previously in a civil partnership, you’ll also need whichever of the following documents is appropriate:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- a civil partnership dissolution or annulment certificate
-- your (or your partner’s) former spouse or civil partner’s [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-^You’ll also need to provide evidence of nationality or residence if the divorce or dissolution took place outside the UK. You’ll need to get it [legalised](/get-document-legalised) and [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.^
-
-###What happens next
-
-The embassy or notary public will charge a fee for taking the oath.
-
-If you give notice at a notary public, you must post the signed forms and any supporting documents to your nearest British embassy or consulate afterwards.
-
-^The embassy or consulate may charge a fee to return your documents to you.^
-
-The consulate will display your notice of marriage publicly for 7 days.
-
-They’ll then send all of your documentation to the British embassy or consulate nearest to where you’re getting married in Venezuela, who will issue your CNI (as long as nobody has registered an objection).
-
-There’s an additional fee for this - the embassy or consulate will contact you to arrange payment.
-
-You should check if your CNI needs to be legalised (certified as genuine) by the local authorities in Venezuela.
-
-^You don't need to stay in the country while your notice is posted.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..5a3c5c9f938
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 35adb765ee9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..5a3c5c9f938
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.erb
@@ -0,0 +1,53 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 35adb765ee9..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_local/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..f99187376e4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.erb
@@ -0,0 +1,64 @@
+You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
+
+Contact them to make an appointment:
+
+$A
+Consular Section
+Torre La Castellana, Piso 11
+Avenida Principal de la Castellana (Av. Eugenio Mendoza),
+Urbanización La Castellana
+Caracas
+Venezuela
+$A
+
+$C
+Emergency: +58 (0) 212 319-5800
+
+[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
+$C
+
+##What documents you’ll need
+
+You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order), or
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Your partner will also need either:
+
+- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
+- an official letter from the local authorities in the country where they’re resident confirming that they’re single
+
+^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
+
+###What you need to do
+
+Once you’ve made your appointment, the British embassy or consulate will give you:
+
+- a notice of registration
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
+
+Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
+
+As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
+
+You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
+
+<%= render partial: 'how_to_pay', locals: {calculator: calculator} %>
+
+*[CNI]:certificate of no impediment
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index efa7753f15c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/venezuela/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-You may be able to register a civil partnership at the British embassy or consulate in Venezuela.
-
-Contact them to make an appointment:
-
-$A
-Consular Section
-Torre La Castellana, Piso 11
-Avenida Principal de la Castellana (Av. Eugenio Mendoza),
-Urbanización La Castellana
-Caracas
-Venezuela
-$A
-
-$C
-Emergency: +58 (0) 212 319-5800
-
-[Consular Section - opening hours](https://www.gov.uk/world/organisations/british-embassy-venezuela/office/consular-section)
-$C
-
-##What documents you’ll need
-
-You’ll need proof that you’ve been resident in the area covered by the British embassy or consulate for at least 7 days, like an employer’s letter or a bank statement.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order), or
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Your partner will also need either:
-
-- a ‘certificate of no impediment’ (CNI) or similar document to prove they’re allowed to enter into a civil partnership from their national authorities
-- an official letter from the local authorities in the country where they’re resident confirming that they’re single
-
-^Any foreign documents may need to be ’[legalised](/get-document-legalised)’ (certified as genuine) in the country they were issued (or that country’s embassy in Venezuela), and [translated into English](/government/collections/list-of-lawyers).^
-
-###What you need to do
-
-Once you’ve made your appointment, the British embassy or consulate will give you:
-
-- a notice of registration
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to enter into a civil partnership
-
-Once you’ve submitted these and paid the registration fee (see below), the British embassy or consulate will display your notice publicly for 14 days.
-
-As long as nobody has registered an objection after this time, the registration officer can then register your partnership any time until 3 months after the date you gave notice.
-
-You’ll need to provide two witnesses and pay a fee to register your civil partnership. You’ll need to pay an additional fee for your civil partnership certificate (see below).
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Venezuela](/government/publications/venezuela-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>
-
-*[CNI]:certificate of no impediment
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
new file mode 100644
index 00000000000..dd2f954fe01
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <% if calculator.partner_is_same_sex? %>
+ Same-sex marriage in Vietnam
+ <% else %>
+ Marriage in Vietnam
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.govspeak.erb
deleted file mode 100644
index ec91ac2025e..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <% if calculator.partner_is_same_sex? %>
- Same-sex marriage in Vietnam
- <% else %>
- Marriage in Vietnam
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..295bb053b49
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,47 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You'll be asked to provide an affirmation or affidavit document to prove you're allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index cb4adb1e164..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You'll be asked to provide an affirmation or affidavit document to prove you're allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..bcd01a9ceee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.erb
@@ -0,0 +1,59 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 73fe0500fab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..2fd04eae063
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,51 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 0649143abec..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..14464ead340
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,52 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 6ab75b86511..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..bcd01a9ceee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.erb
@@ -0,0 +1,59 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 73fe0500fab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/ceremony_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..35a4c2f1093
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.erb
@@ -0,0 +1,48 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 4b372e8a607..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..bcd01a9ceee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.erb
@@ -0,0 +1,59 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 73fe0500fab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..b6805fddcd4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.erb
@@ -0,0 +1,52 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8e733723a47..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..b6805fddcd4
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.erb
@@ -0,0 +1,52 @@
+
+Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 8e733723a47..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-Contact the relevant local authorities in Vietnam to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..bcd01a9ceee
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.erb
@@ -0,0 +1,59 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 73fe0500fab..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/third_country/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.erb
new file mode 100644
index 00000000000..52dcea91018
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.erb
@@ -0,0 +1,59 @@
+
+Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+###Before travelling to Vietnam
+
+If you’ve been married or in a civil partnership before you’ll need to get supporting documents [legalised in the UK](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/667699/2017-10-18_Legalisation_of_signatures_and_official_stamps.pdf). Depending on how your marriage or civil partnership ended, this will be:
+
+- your [decree absolute or final order](/copy-decree-absolute-final-order) - if you’re divorced
+- your partner’s [death certificate](/order-copy-birth-death-marriage-certificate) - if you’re widowed
+
+You do not need to get a certificate of no impediment (CNI).
+
+###When you’re in Vietnam
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an affirmation or affidavit as well.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.govspeak.erb
deleted file mode 100644
index 6dee7f79049..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-###Before travelling to Vietnam
-
-If you’ve been married or in a civil partnership before you’ll need to get supporting documents [legalised in the UK](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/667699/2017-10-18_Legalisation_of_signatures_and_official_stamps.pdf). Depending on how your marriage or civil partnership ended, this will be:
-
-- your [decree absolute or final order](/copy-decree-absolute-final-order) - if you’re divorced
-- your partner’s [death certificate](/order-copy-birth-death-marriage-certificate) - if you’re widowed
-
-You do not need to get a certificate of no impediment (CNI).
-
-###When you’re in Vietnam
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an affirmation or affidavit as well.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.erb
new file mode 100644
index 00000000000..8d408e3bf65
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.erb
@@ -0,0 +1,65 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+###What documents your partner will need
+
+Your partner will need to provide a certificate of no impediment (CNI) or a similar document to prove they're legally allowed to get married. They can get this from the local authorities in their country or their countries embassy in Vietnam.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+Before your ceremony, you’ll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.govspeak.erb
deleted file mode 100644
index 9422430928c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_british/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-###What documents your partner will need
-
-Your partner will need to provide a certificate of no impediment (CNI) or a similar document to prove they're legally allowed to get married. They can get this from the local authorities in their country or their countries embassy in Vietnam.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-Before your ceremony, you’ll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.erb
new file mode 100644
index 00000000000..7c79040a61e
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.erb
@@ -0,0 +1,63 @@
+
+Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+###Before travelling to Vietnam
+
+If you’ve been married or in a civil partnership before you’ll need to get supporting documents [legalised in the UK](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/667699/2017-10-18_Legalisation_of_signatures_and_official_stamps.pdf). Depending on how your marriage or civil partnership ended, this will be:
+
+- your [decree absolute or final order](/copy-decree-absolute-final-order) - if you’re divorced
+- your partner’s [death certificate](/order-copy-birth-death-marriage-certificate) - if you’re widowed
+
+You do not need to get a certificate of no impediment (CNI).
+
+###When you’re in Vietnam
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.govspeak.erb
deleted file mode 100644
index d03c5470e14..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-
-Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-###Before travelling to Vietnam
-
-If you’ve been married or in a civil partnership before you’ll need to get supporting documents [legalised in the UK](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/667699/2017-10-18_Legalisation_of_signatures_and_official_stamps.pdf). Depending on how your marriage or civil partnership ended, this will be:
-
-- your [decree absolute or final order](/copy-decree-absolute-final-order) - if you’re divorced
-- your partner’s [death certificate](/order-copy-birth-death-marriage-certificate) - if you’re widowed
-
-You do not need to get a certificate of no impediment (CNI).
-
-###When you’re in Vietnam
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.erb
new file mode 100644
index 00000000000..377532a0028
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.erb
@@ -0,0 +1,51 @@
+
+Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
+
+^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
+
+##What you need to do
+
+You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
+
+Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
+
+- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
+- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
+
+At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+###Legalisation and translation
+
+You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
+
+If you’ve been divorced or widowed, you’ll also need:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
+
+You’ll also need to provide evidence if you’ve changed your name by deed poll.
+
+^Your partner will probably need to get an equivalent document from their national authorities.^
+
+##What happens next
+
+You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
+
+You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.govspeak.erb
deleted file mode 100644
index 95d86a338fe..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_opposite_sex.govspeak.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Contact the [Embassy of Vietnam](/government/publications/foreign-embassies-in-the-uk) before making any plans to find out about local marriage laws, including what documents you’ll need.
-
-^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for Vietnam](/foreign-travel-advice/vietnam) before making any plans.
-
-##What you need to do
-
-You’ll be asked to provide an affirmation or affidavit document to prove you’re allowed to marry.
-
-Make an appointment at the British embassy in Hanoi or the British Consulate General in Ho Chi Minh City to swear an affidavit (written statement of facts) that you're free to marry:
-
-- [Make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/oaths-affirmations-and-affidavits/slot_picker)
-- [Make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/oaths-affirmations-and-affidavits/slot_picker)
-
-At your appointment, you'll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-###Legalisation and translation
-
-You’ll need to get your affirmation or affidavit [translated](/government/collections/lists-of-translators-and-interpreters) into the local language and ‘[legalised](/get-document-legalised)’ (certified as genuine) by the local authorities - the embassy or consulate should be able to give you advice.
-
-If you’ve been divorced or widowed, you’ll also need:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order) or the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-- evidence of nationality or residence where your divorce took place if it was outside the UK. You’ll need to get it [translated](/government/collections/lists-of-translators-and-interpreters) if it’s not in English.
-
-You’ll also need to provide evidence if you’ve changed your name by deed poll.
-
-^Your partner will probably need to get an equivalent document from their national authorities.^
-
-##What happens next
-
-You must present your approved affirmation or affidavit for marriage to a local registrar in Vietnam. They will register the marriage and provide you with a marriage certificate.
-
-You’ll need to bring your passport. Check with the register what other supporting documents you’ll need.
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.erb
new file mode 100644
index 00000000000..8d408e3bf65
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.erb
@@ -0,0 +1,65 @@
+You may be able to get married at the British embassy in Hanoi.
+
+Make an appointment at the embassy or consulate to give notice of your intention to marry:
+
+- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
+- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
+
+^You can only register your marriage at the British Embassy in Hanoi.^
+
+##What documents you’ll need
+
+You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
+
+You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
+
+- a [decree absolute or final order](/copy-decree-absolute-final-order)
+- the [death certificate](/order-copy-birth-death-marriage-certificate/)
+
+Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
+
+###What documents your partner will need
+
+Your partner will need to provide a certificate of no impediment (CNI) or a similar document to prove they're legally allowed to get married. They can get this from the local authorities in their country or their countries embassy in Vietnam.
+
+##What you need to do
+
+You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
+
+- a notice of intention to marry
+- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
+
+Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
+
+^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
+
+As long as nobody registers an objection you can get married.
+
+Before your ceremony, you’ll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
+
+You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
+
+You’ll need to pay a fee to register your marriage and a fee for your marriage.
+
+^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
+
+##Naturalisation of your partner if they move to the UK
+
+Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+Service | Fee
+-|-
+Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
+Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
+Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
+
+You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
+
+<%= render partial: 'how_to_pay',
+ locals: {calculator: calculator}%>
+
+##Convert a civil partnership to a same-sex marriage
+
+If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.govspeak.erb
deleted file mode 100644
index 9422430928c..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/uk/partner_other/_same_sex.govspeak.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-You may be able to get married at the British embassy in Hanoi.
-
-Make an appointment at the embassy or consulate to give notice of your intention to marry:
-
-- [make an appointment at the British Embassy in Hanoi](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-hanoi/notice-of-marriage-or-civil-partnership/slot_picker)
-- [make an appointment at the Consulate General in Ho Chi Minh City](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-ho-chi-minh-city/notice-of-marriage-or-civil-partnership/slot_picker)
-
-^You can only register your marriage at the British Embassy in Hanoi.^
-
-##What documents you’ll need
-
-You and your partner will need to sign a declaration and provide proof of residence for example, an employer’s letter, a bank statement or your flight ticket.
-
-You’ll both need your original passports. If either of you have been divorced, widowed or in a civil partnership before, you’ll also need either:
-
-- a [decree absolute or final order](/copy-decree-absolute-final-order)
-- the [death certificate](/order-copy-birth-death-marriage-certificate/)
-
-Foreign documents, for example certificates of no impediment (CNI) or divorce certificates, must be translated into English and certified by a qualified translator.
-
-###What documents your partner will need
-
-Your partner will need to provide a certificate of no impediment (CNI) or a similar document to prove they're legally allowed to get married. They can get this from the local authorities in their country or their countries embassy in Vietnam.
-
-##What you need to do
-
-You’ll both need to be in Vietnam for 7 clear days (not including the date of arrival) before your appointment to post notice of your intention to marry. At your appointment, the embassy or consulate will give you:
-
-- a notice of intention to marry
-- a declaration that you and your partner will need to swear, stating that you’re legally entitled to marry
-
-Once you’ve completed these and paid the registration fee, the embassy or consulate will display your notice publicly for 14 days.
-
-^You must stay in Vietnam while your notice is posted if you're not normally resident in Vietnam.^
-
-As long as nobody registers an objection you can get married.
-
-Before your ceremony, you’ll complete and sign an [affirmation or affidavit](/government/publications/affirmation-affidavit-of-marital-status-vietnam) of marital status in front of a consular officer. You can fill in (but not sign) the form before your appointment.
-
-You’ll need to bring two witnesses to your ceremony - they’ll need to show their photo ID (for example passport or driver’s licence).
-
-You’ll need to pay a fee to register your marriage and a fee for your marriage.
-
-^All same-sex marriages must take place under English and Welsh or Scottish law even if you live in or are from Northern Ireland. Tell the embassy or consulate which law you want to get married under at your appointment.^
-
-##Naturalisation of your partner if they move to the UK
-
-Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-Service | Fee
--|-
-Receiving a notice of registration | <%= format_money calculator.consular_fee(:receiving_notice_of_registration) %>
-Registering a marriage | <%= format_money calculator.consular_fee(:registering_marriage) %>
-Issuing a marriage certificate | <%= format_money calculator.consular_fee(:issuing_civil_partnership_or_marriage_certificate) %>
-
-You can pay fees for consular services in the local currency or pounds sterling - these are shown in the list of [consular fees for Vietnam](/government/publications/vietnam-consular-fees).
-
-<%= render partial: 'how_to_pay.govspeak.erb',
- locals: {calculator: calculator}%>
-
-##Convert a civil partnership to a same-sex marriage
-
-If you’ve already entered into a civil partnership you may be able to convert it to a same-sex marriage - read [‘Convert a civil partnership to a same-sex marriage abroad’](/convert-civil-partnership-abroad).
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_marriage.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_marriage.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_marriage.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_marriage.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.erb
new file mode 100644
index 00000000000..7355303d061
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.erb
@@ -0,0 +1,48 @@
+Wallis and Futuna is an overseas department or territory of France. The rules and requirements for PACS there are similar to France.
+
+Contact the [’tribunal d’instance’](http://www.annuaires.justice.gouv.fr/annuaires-12162/annuaire-des-tribunaux-dinstance-21775.html) in the town where you’re entering into a PACS to find out about local laws, including what documents you’ll need.
+
+If you’re not in France, [your closest French embassy](http://www.mfe.org/index.php/Annuaires/Ambassades-et-consulats-francais-a-l-etranger) may also be able to give you advice, or put you in touch with the relevant local authorities.
+
+^You should [get legal advice](/government/publications/france-list-of-lawyers) before making any plans.^
+
+##What you need to do
+
+You may be asked to provide a certificate of custom (‘certificat de coutume’) if you’re entering into a PACS in Wallis and Futuna.
+
+You should check with the tribunal d’instance to find out if you need one.
+
+If you need a certificate of custom, you can get one from the [British Embassy in Paris](/government/world/organisations/british-embassy-paris).
+
+Some tribunals only accept a certificate of custom dated less than 6 months before the date of your PACS. You should check with them before you apply. If your certificate is refused because you applied too early, you will need to apply and pay again.
+
+###Applying for a certificate of custom from the British Embassy
+
+s1. Download the [certificate of custom application form](/government/publications/application-form-for-certificate-of-custom-law-for-pacs-france)
+s2. Make sure you’ve got all of the supporting documents you need - there’s a checklist on the form.
+s3. You’ll need to include a pre-paid self-addressed envelope and a registered letter slip (‘récépissé d’un envoi recommandé sans avis de réception’) with your name and address, or a €6.55 postage fee, if you want your documents to be returned.
+s4. Send your completed form to the British Embassy with your supporting documents and the correct fee. You’ll have to pay in euros, as instructed on the payment slip attached to the form. See fee 11 on [consular fees for France](/government/publications/france-consular-fees) for the current cost. Send your application by registered post if you want confirmation of delivery.
+s5. The embassy will send your certificate and documents about 2 weeks after receiving your application. Certificates are issued in French and don’t need to be legalised.
+
+^If you both need a certificate of custom, you can apply together, but each partner must provide a completed application form and supporting documents. You’ll have to pay 2 fees but only one return postage fee.^
+
+###The certificate of celibacy
+
+The tribunal might also ask you for a certificate of celibacy (‘certificat de célibat’) to prove you’re not already married or in a civil partnership. It’s not possible to provide this under UK law, so you’ll need to download the explanatory note and take this to the tribunal instead.
+
+$D
+[Download ‘Explanatory note in lieu of a certificate of celibacy’](/government/publications/france-explanatory-note-in-lieu-of-certificat-celibat)
+$D
+
+##Naturalisation of your foreign partner if they move to the UK
+
+If your partner isn’t British, they can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
+
+## Fees
+
+<%= render partial: 'consular_fees_table_items',
+ collection: calculator.services,
+ as: :service,
+ locals: { calculator: calculator } %>
+
+*[PACS]:pacte civil de solidarité
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.govspeak.erb
deleted file mode 100644
index 1d6926a23a3..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_pacs.govspeak.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-Wallis and Futuna is an overseas department or territory of France. The rules and requirements for PACS there are similar to France.
-
-Contact the [’tribunal d’instance’](http://www.annuaires.justice.gouv.fr/annuaires-12162/annuaire-des-tribunaux-dinstance-21775.html) in the town where you’re entering into a PACS to find out about local laws, including what documents you’ll need.
-
-If you’re not in France, [your closest French embassy](http://www.mfe.org/index.php/Annuaires/Ambassades-et-consulats-francais-a-l-etranger) may also be able to give you advice, or put you in touch with the relevant local authorities.
-
-^You should [get legal advice](/government/publications/france-list-of-lawyers) before making any plans.^
-
-##What you need to do
-
-You may be asked to provide a certificate of custom (‘certificat de coutume’) if you’re entering into a PACS in Wallis and Futuna.
-
-You should check with the tribunal d’instance to find out if you need one.
-
-If you need a certificate of custom, you can get one from the [British Embassy in Paris](/government/world/organisations/british-embassy-paris).
-
-Some tribunals only accept a certificate of custom dated less than 6 months before the date of your PACS. You should check with them before you apply. If your certificate is refused because you applied too early, you will need to apply and pay again.
-
-###Applying for a certificate of custom from the British Embassy
-
-s1. Download the [certificate of custom application form](/government/publications/application-form-for-certificate-of-custom-law-for-pacs-france)
-s2. Make sure you’ve got all of the supporting documents you need - there’s a checklist on the form.
-s3. You’ll need to include a pre-paid self-addressed envelope and a registered letter slip (‘récépissé d’un envoi recommandé sans avis de réception’) with your name and address, or a €6.55 postage fee, if you want your documents to be returned.
-s4. Send your completed form to the British Embassy with your supporting documents and the correct fee. You’ll have to pay in euros, as instructed on the payment slip attached to the form. See fee 11 on [consular fees for France](/government/publications/france-consular-fees) for the current cost. Send your application by registered post if you want confirmation of delivery.
-s5. The embassy will send your certificate and documents about 2 weeks after receiving your application. Certificates are issued in French and don’t need to be legalised.
-
-^If you both need a certificate of custom, you can apply together, but each partner must provide a completed application form and supporting documents. You’ll have to pay 2 fees but only one return postage fee.^
-
-###The certificate of celibacy
-
-The tribunal might also ask you for a certificate of celibacy (‘certificat de célibat’) to prove you’re not already married or in a civil partnership. It’s not possible to provide this under UK law, so you’ll need to download the explanatory note and take this to the tribunal instead.
-
-$D
-[Download ‘Explanatory note in lieu of a certificate of celibacy’](/government/publications/france-explanatory-note-in-lieu-of-certificat-celibat)
-$D
-
-##Naturalisation of your foreign partner if they move to the UK
-
-If your partner isn’t British, they can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
-
-## Fees
-
-<%= render partial: 'consular_fees_table_items.govspeak.erb',
- collection: calculator.services,
- as: :service,
- locals: { calculator: calculator } %>
-
-*[PACS]:pacte civil de solidarité
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/wallis-and-futuna/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/western-sahara/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/yemen/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/_title.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/ceremony_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/third_country/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_british/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_local/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_opposite_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_opposite_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_opposite_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_opposite_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_same_sex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_same_sex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zambia/uk/partner_other/_same_sex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zimbabwe/_title.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/zimbabwe/_title.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/countries/zimbabwe/_title.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/countries/zimbabwe/_title.erb
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
new file mode 100644
index 00000000000..080cf05355c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ <%= render partial: 'countries/'+calculator.ceremony_country+'/title', locals: {calculator: calculator} %>
+<% end %>
+
+<% govspeak_for :body do %>
+ <%= render partial: 'countries/'+calculator.path_to_outcome.join('/'), locals: {calculator: calculator} %>
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.govspeak.erb
deleted file mode 100644
index 6cb9dedd840..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- <%= render partial: 'countries/'+calculator.ceremony_country+'/title', locals: {calculator: calculator} %>
-<% end %>
-
-<% render_content_for :body do %>
- <%= render partial: 'countries/'+calculator.path_to_outcome.join('/'), locals: {calculator: calculator} %>
-<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_in_local_currency_or_credit_card_not_cheque.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_in_local_currency_or_credit_card_not_cheque.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_in_local_currency_or_credit_card_not_cheque.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_in_local_currency_or_credit_card_not_cheque.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_only.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_only.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_only.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_only.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_bank_cheque.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_bank_cheque.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_bank_cheque.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_bank_cheque.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque_nor_amex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque_nor_amex.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque_nor_amex.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_cheque_nor_amex.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_personal_cheque.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_personal_cheque.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_personal_cheque.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_credit_card_no_personal_cheque.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_debit_or_credit_card.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_debit_or_credit_card.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_debit_or_credit_card.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_debit_or_credit_card.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_us_dollars_only.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_us_dollars_only.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_us_dollars_only.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_cash_or_us_dollars_only.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_iranian_cash_only.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_iranian_cash_only.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_iranian_cash_only.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_iranian_cash_only.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_mastercard_and_visa_only.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_mastercard_and_visa_only.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_mastercard_and_visa_only.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_mastercard_and_visa_only.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visa_masterdcard_sometimes_cash_or_friends_card.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visa_masterdcard_sometimes_cash_or_friends_card.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visa_masterdcard_sometimes_cash_or_friends_card.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visa_masterdcard_sometimes_cash_or_friends_card.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visas_or_mastercard.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visas_or_mastercard.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visas_or_mastercard.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_by_visas_or_mastercard.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_cash_visa_or_mastercard.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_cash_visa_or_mastercard.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_cash_visa_or_mastercard.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_cash_visa_or_mastercard.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euro_or_sterling_or_card.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euro_or_sterling_or_card.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euro_or_sterling_or_card.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euro_or_sterling_or_card.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euros_or_visa_electron.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euros_or_visa_electron.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euros_or_visa_electron.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_euros_or_visa_electron.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_japan.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_japan.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_japan.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_japan.erb
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_local_currency_ceremony_country_name.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_local_currency_ceremony_country_name.erb
similarity index 100%
rename from lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_local_currency_ceremony_country_name.govspeak.erb
rename to lib/smart_answer_flows/marriage-abroad/outcomes/payment_information_partials/_pay_in_local_currency_ceremony_country_name.erb
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
new file mode 100644
index 00000000000..b2818368d86
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Where do you want to get married?
+<% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.govspeak.erb
deleted file mode 100644
index cb6ef93dee5..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..b15e780531a
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where do you live?
+<% end %>
+
+<% options(
+ "uk": "UK",
+ "ceremony_country": calculator.ceremony_country_name,
+ "third_country": "Elsewhere"
+) %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.govspeak.erb
deleted file mode 100644
index 7e15e196a5f..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where do you live?
-<% end %>
-
-<% options(
- "uk": "UK",
- "ceremony_country": calculator.ceremony_country_name,
- "third_country": "Elsewhere"
-) %>
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
new file mode 100644
index 00000000000..deb69a0a6e9
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do you want to get married or enter into a PACS?
+<% end %>
+
+<% options(
+ "marriage": "Marriage",
+ "pacs": "PACS"
+) %>
+
+<% 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/marriage_or_pacs.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.govspeak.erb
deleted file mode 100644
index cd47731ac71..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do you want to get married or enter into a PACS?
-<% end %>
-
-<% options(
- "marriage": "Marriage",
- "pacs": "PACS"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a4db4bcba4c
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your partner of the opposite sex, or the same sex?
+<% end %>
+
+<% options(
+ "opposite_sex": "Opposite sex",
+ "same_sex": "Same sex"
+) %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.govspeak.erb
deleted file mode 100644
index 2b6cbe9766d..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your partner of the opposite sex, or the same sex?
-<% end %>
-
-<% options(
- "opposite_sex": "Opposite sex",
- "same_sex": "Same sex"
-) %>
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
new file mode 100644
index 00000000000..82e14621796
--- /dev/null
+++ b/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ What is your partner’s nationality?
+<% end %>
+
+<% options(
+ "partner_british": "British",
+ "partner_local": calculator.country_name_partner_residence,
+ "partner_other": "National of another country"
+) %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.govspeak.erb
deleted file mode 100644
index 6a696f10643..00000000000
--- a/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- What is your partner’s nationality?
-<% end %>
-
-<% options(
- "partner_british": "British",
- "partner_local": calculator.country_name_partner_residence,
- "partner_other": "National of another country"
-) %>
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
new file mode 100644
index 00000000000..6a763954c11
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.erb
@@ -0,0 +1,31 @@
+<% text_for :title do %>
+ Maternity, Adoption and paternity calculator for employers
+<% end %>
+
+<% text_for :meta_description do %>
+ Calculate an employee’s maternity pay (SMP), paternity or adoption pay, relevant period and average weekly earnings
+<% end %>
+
+<% govspeak_for :body do %>
+ Calculate your employee’s:
+
+ + Statutory Maternity Pay (SMP), paternity pay, adoption pay
+ + relevant employment period and average weekly earnings
+ + leave period
+<% end %>
+
+<% govspeak_for :post_body do %>
+ You need:
+
+ + the baby’s due date
+ + date of birth - for paternity
+ + your employee’s salary details, eg weekly rates of pay
+ + the dates for adoption, eg match date and date of placement
+
+
+ You can’t use the calculator for:
+
+ + births 15 weeks before the due date
+ + paternity leave or pay for [overseas adoptions](/employers-paternity-pay-leave/adoption)
+ + [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide)
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.govspeak.erb
deleted file mode 100644
index 05af8a9aa32..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.govspeak.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% render_content_for :title do %>
- Maternity, Adoption and paternity calculator for employers
-<% end %>
-
-<% render_content_for :meta_description do %>
- Calculate an employee’s maternity pay (SMP), paternity or adoption pay, relevant period and average weekly earnings
-<% end %>
-
-<% render_content_for :body do %>
- Calculate your employee’s:
-
- + Statutory Maternity Pay (SMP), paternity pay, adoption pay
- + relevant employment period and average weekly earnings
- + leave period
-<% end %>
-
-<% render_content_for :post_body do %>
- You need:
-
- + the baby’s due date
- + date of birth - for paternity
- + your employee’s salary details, eg weekly rates of pay
- + the dates for adoption, eg match date and date of placement
-
-
- You can’t use the calculator for:
-
- + births 15 weeks before the due date
- + paternity leave or pay for [overseas adoptions](/employers-paternity-pay-leave/adoption)
- + [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide)
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_be_on_payroll.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_be_on_payroll.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_be_on_payroll.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_be_on_payroll.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_earn_over_threshold.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_earn_over_threshold.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_earn_over_threshold.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_must_earn_over_threshold.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_not_worked_long_enough.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_not_worked_long_enough.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_not_worked_long_enough.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_not_worked_long_enough.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_entitled_to_leave.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_entitled_to_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_entitled_to_leave.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_entitled_to_leave.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_leave.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_leave.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_leave.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_intro.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_intro.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_intro.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_intro.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_outro.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_outro.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_outro.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_paternity_not_entitled_to_pay_outro.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_spp_claim_link.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_spp_claim_link.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_spp_claim_link.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/outcomes/_spp_claim_link.erb
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.erb
new file mode 100644
index 00000000000..8e605025213
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.erb
@@ -0,0 +1,61 @@
+<% govspeak_for :body do %>
+ <% if calculator.employee_has_contract_adoption == 'no' %>
+ ##Statutory Adoption Leave
+
+ The employee is not entitled to Statutory Adoption Leave because they don’t have an employment contract with you.
+
+ Write to them within 28 days of their leave request confirming this.
+ <% else %>
+ ##Statutory Adoption Leave
+
+ The employee is entitled to up to 52 weeks Statutory Adoption Leave if they [claim the leave on time](/employers-adoption-pay-leave/notice-period).
+
+ |Leave | Key dates |
+ |------------------------------|-----------------------------|
+ |Start | <%= format_date(leave_start_date) %> |
+ |End | <%= format_date(leave_end_date) %> |
+ <% end %>
+
+ <% if calculator.on_payroll == 'no' || calculator.average_weekly_earnings_under_lower_earning_limit? %>
+
+ ##Statutory Adoption Pay
+
+ The employee is not entitled to Statutory Adoption Pay. To qualify:
+
+ <% if calculator.on_payroll == 'no' %>
+
+ + <%= render partial: 'must_be_on_payroll' %>
+ <% elsif calculator.average_weekly_earnings_under_lower_earning_limit? %>
+
+ + <%= render partial: 'must_earn_over_threshold',
+ locals: {
+ average_weekly_earnings: average_weekly_earnings,
+ relevant_period: relevant_period,
+ lower_earning_limit: lower_earning_limit
+ } %>
+ <% end %>
+ Send them form SAP1 within 7 days of your decision. They must get this form within 28 days of their pay request or the date they were matched with the child (whichever is earlier).
+
+
+ $D [Download Form SAP1, Non-payment of Statutory Adoption Pay (PDF, 59KB)](http://www.hmrc.gov.uk/forms/sap1.pdf) $D
+ <% else %>
+
+ ##Statutory Adoption Pay
+
+ The employee is entitled to up to 39 weeks Statutory Adoption Pay (SAP) if they [claim SAP in time](/employers-adoption-pay-leave/notice-period) and give you [proof of the adoption](/employers-adoption-pay-leave/proof-of-adoption).
+
+ The employee’s average weekly earnings are: <%= format_money(average_weekly_earnings) %>.
+
+ Date | SAP amount
+ -|-
+ <%= pay_dates_and_pay %>
+ | **Total SAP: <%= format_money(total_sap) %>**
+
+ %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
+ <% end %>
+<% end %>
+
+<% govspeak_for :next_steps do %>
+
+ Read the [guide to Statutory Adoption Pay and Leave](/adoption-leave-pay-employees)
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.govspeak.erb
deleted file mode 100644
index 6b7f3406a93..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_leave_and_pay.govspeak.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-<% render_content_for :body do %>
- <% if calculator.employee_has_contract_adoption == 'no' %>
- ##Statutory Adoption Leave
-
- The employee is not entitled to Statutory Adoption Leave because they don’t have an employment contract with you.
-
- Write to them within 28 days of their leave request confirming this.
- <% else %>
- ##Statutory Adoption Leave
-
- The employee is entitled to up to 52 weeks Statutory Adoption Leave if they [claim the leave on time](/employers-adoption-pay-leave/notice-period).
-
- |Leave | Key dates |
- |------------------------------|-----------------------------|
- |Start | <%= format_date(leave_start_date) %> |
- |End | <%= format_date(leave_end_date) %> |
- <% end %>
-
- <% if calculator.on_payroll == 'no' || calculator.average_weekly_earnings_under_lower_earning_limit? %>
-
- ##Statutory Adoption Pay
-
- The employee is not entitled to Statutory Adoption Pay. To qualify:
-
- <% if calculator.on_payroll == 'no' %>
-
- + <%= render partial: 'must_be_on_payroll.govspeak.erb' %>
- <% elsif calculator.average_weekly_earnings_under_lower_earning_limit? %>
-
- + <%= render partial: 'must_earn_over_threshold.govspeak.erb',
- locals: {
- average_weekly_earnings: average_weekly_earnings,
- relevant_period: relevant_period,
- lower_earning_limit: lower_earning_limit
- } %>
- <% end %>
- Send them form SAP1 within 7 days of your decision. They must get this form within 28 days of their pay request or the date they were matched with the child (whichever is earlier).
-
-
- $D [Download Form SAP1, Non-payment of Statutory Adoption Pay (PDF, 59KB)](http://www.hmrc.gov.uk/forms/sap1.pdf) $D
- <% else %>
-
- ##Statutory Adoption Pay
-
- The employee is entitled to up to 39 weeks Statutory Adoption Pay (SAP) if they [claim SAP in time](/employers-adoption-pay-leave/notice-period) and give you [proof of the adoption](/employers-adoption-pay-leave/proof-of-adoption).
-
- The employee’s average weekly earnings are: <%= format_money(average_weekly_earnings) %>.
-
- Date | SAP amount
- -|-
- <%= pay_dates_and_pay %>
- | **Total SAP: <%= format_money(total_sap) %>**
-
- %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
- <% end %>
-<% end %>
-
-<% render_content_for :next_steps do %>
-
- Read the [guide to Statutory Adoption Pay and Leave](/adoption-leave-pay-employees)
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.erb
new file mode 100644
index 00000000000..3e3984d32b5
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ ##Not entitled to Statutory Adoption Leave and Pay
+
+ <% if adoption_is_from_overseas%>
+ The employee is not entitled to Statutory Adoption Leave or Pay because they must have started working for you on <%= format_date(a_leave_employment_threshold) %>.
+ <% else %>
+ The employee is not entitled to Statutory Adoption Leave or Pay because they must have started working for you on <%= format_date(employment_start) %>.
+ <% end %>
+
+ You must write confirming this. Also, send them form SAP1 confirming they’re not entitled to pay within 28 days of their pay request.
+
+
+ $D [Download Form SAP1, Non-payment of Statutory Adoption Pay (PDF, 59KB)](http://www.hmrc.gov.uk/forms/sap1.pdf) $D
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ Read the [guide to Statutory Adoption Pay and Leave](/adoption-leave-pay-employees)
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.govspeak.erb
deleted file mode 100644
index b5836dcbfc8..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/adoption_not_entitled_to_leave_or_pay.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- ##Not entitled to Statutory Adoption Leave and Pay
-
- <% if adoption_is_from_overseas%>
- The employee is not entitled to Statutory Adoption Leave or Pay because they must have started working for you on <%= format_date(a_leave_employment_threshold) %>.
- <% else %>
- The employee is not entitled to Statutory Adoption Leave or Pay because they must have started working for you on <%= format_date(employment_start) %>.
- <% end %>
-
- You must write confirming this. Also, send them form SAP1 confirming they’re not entitled to pay within 28 days of their pay request.
-
-
- $D [Download Form SAP1, Non-payment of Statutory Adoption Pay (PDF, 59KB)](http://www.hmrc.gov.uk/forms/sap1.pdf) $D
-<% end %>
-
-<% render_content_for :next_steps do %>
- Read the [guide to Statutory Adoption Pay and Leave](/adoption-leave-pay-employees)
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.erb
new file mode 100644
index 00000000000..0ad618d7c3c
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.erb
@@ -0,0 +1,86 @@
+<% govspeak_for :body do %>
+ <% if has_employment_contract_between_dates == 'yes' || has_employment_contract_now == 'yes' %>
+ ##Statutory Maternity Leave
+
+ The employee is entitled to up to 52 weeks Statutory Maternity Leave.
+
+ |Leave | Key dates |
+ |------------------------------|------------------------------|
+ |Start | <%= format_date(leave_start_date) %> |
+ |End | <%= format_date(leave_end_date) %> |
+ |Latest date to [claim leave](/maternity-leave-pay-employees/notice-period "Notice period") | <%= format_date(notice_of_leave_deadline) %> |
+ |Earliest date leave can start | <%= format_date(leave_earliest_start_date) %> |
+
+ <% else %>
+ ##Statutory Maternity Leave
+
+ The employee is not entitled to Statutory Maternity Leave because they do not have an employment contract with you.
+
+ Write to them within 28 days of their leave request confirming this.
+
+ <% end %>
+
+ <% if not_entitled_to_pay_reason.present? %>
+ <% if calculator.earnings_for_pay_period %>
+ ##Statutory Maternity Pay
+
+ The employee is not entitled to Statutory Maternity Pay.
+ Their average weekly earnings are <%= format_money(average_weekly_earnings) %> (you can’t round this figure up or down). To qualify:
+
+ <% else %>
+ ##Statutory Maternity Pay
+
+ The employee is not entitled to Statutory Maternity Pay. To qualify:
+
+ <% end %>
+ <% case not_entitled_to_pay_reason %>
+ <% when :must_earn_over_threshold %>
+
+ + <%= render partial: 'must_earn_over_threshold',
+ locals: {
+ average_weekly_earnings: average_weekly_earnings,
+ relevant_period: relevant_period,
+ lower_earning_limit: lower_earning_limit
+ } %>
+ <% when :not_worked_long_enough_and_not_on_payroll %>
+
+ + they must have worked continually for you between <%= format_date(employment_start) %> and <%= format_date(qualifying_week_start) %>.
+ + <%= render partial: 'must_be_on_payroll' %>
+ <% end %>
+ You must write confirming this within 28 days of their maternity pay request.
+
+ Send them form SMP1 within 7 days of your decision. They must get this form within 28 days of their pay request or the birth (whichever is earlier).
+
+
+ $D [Download Form SMP1, Non-payment of Statutory Maternity Pay (PDF, 59KB)](http://www.dwp.gov.uk/advisers/claimforms/smp1_print.pdf) $D
+
+ <% else %>
+ ##Statutory Maternity Pay
+
+ The employee is entitled to up to 39 weeks Statutory Maternity Pay (SMP) if they [claim SMP in time](/maternity-leave-pay-employees/notice-period "Notice period") and give [proof of the pregnancy](/maternity-leave-pay-employees/eligibility "Proof of pregnancy").
+
+ Pay | Key facts
+ -|-
+ Average weekly earnings | £<%= number_with_precision(average_weekly_earnings, precision: 7) %> (don't round this up or down)
+ Latest date to claim SMP | <%= format_date(notice_request_pay) %>
+ SMP start date due to pregnancy related illness| <%= format_date(ssp_stop) %>
+ Proof of pregnancy | Usually within 21 days of the SMP start date (or as soon as possible if baby born early)
+
+ %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
+
+
+ ## SMP calculation
+
+ Date | SMP amount
+ -|-
+ <%= pay_dates_and_pay %>
+ | **Total SMP: <%= format_money(total_smp) %>**
+
+ <% end %>
+
+ *[SMP]: Statutory Maternity Pay
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ Read the [guide to Statutory Maternity Pay and Leave](/employers-maternity-pay-leave)
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.govspeak.erb
deleted file mode 100644
index a0d9aed4ec4..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/maternity_leave_and_pay_result.govspeak.erb
+++ /dev/null
@@ -1,86 +0,0 @@
-<% render_content_for :body do %>
- <% if has_employment_contract_between_dates == 'yes' || has_employment_contract_now == 'yes' %>
- ##Statutory Maternity Leave
-
- The employee is entitled to up to 52 weeks Statutory Maternity Leave.
-
- |Leave | Key dates |
- |------------------------------|------------------------------|
- |Start | <%= format_date(leave_start_date) %> |
- |End | <%= format_date(leave_end_date) %> |
- |Latest date to [claim leave](/maternity-leave-pay-employees/notice-period "Notice period") | <%= format_date(notice_of_leave_deadline) %> |
- |Earliest date leave can start | <%= format_date(leave_earliest_start_date) %> |
-
- <% else %>
- ##Statutory Maternity Leave
-
- The employee is not entitled to Statutory Maternity Leave because they do not have an employment contract with you.
-
- Write to them within 28 days of their leave request confirming this.
-
- <% end %>
-
- <% if not_entitled_to_pay_reason.present? %>
- <% if calculator.earnings_for_pay_period %>
- ##Statutory Maternity Pay
-
- The employee is not entitled to Statutory Maternity Pay.
- Their average weekly earnings are <%= format_money(average_weekly_earnings) %> (you can’t round this figure up or down). To qualify:
-
- <% else %>
- ##Statutory Maternity Pay
-
- The employee is not entitled to Statutory Maternity Pay. To qualify:
-
- <% end %>
- <% case not_entitled_to_pay_reason %>
- <% when :must_earn_over_threshold %>
-
- + <%= render partial: 'must_earn_over_threshold.govspeak.erb',
- locals: {
- average_weekly_earnings: average_weekly_earnings,
- relevant_period: relevant_period,
- lower_earning_limit: lower_earning_limit
- } %>
- <% when :not_worked_long_enough_and_not_on_payroll %>
-
- + they must have worked continually for you between <%= format_date(employment_start) %> and <%= format_date(qualifying_week_start) %>.
- + <%= render partial: 'must_be_on_payroll.govspeak.erb' %>
- <% end %>
- You must write confirming this within 28 days of their maternity pay request.
-
- Send them form SMP1 within 7 days of your decision. They must get this form within 28 days of their pay request or the birth (whichever is earlier).
-
-
- $D [Download Form SMP1, Non-payment of Statutory Maternity Pay (PDF, 59KB)](http://www.dwp.gov.uk/advisers/claimforms/smp1_print.pdf) $D
-
- <% else %>
- ##Statutory Maternity Pay
-
- The employee is entitled to up to 39 weeks Statutory Maternity Pay (SMP) if they [claim SMP in time](/maternity-leave-pay-employees/notice-period "Notice period") and give [proof of the pregnancy](/maternity-leave-pay-employees/eligibility "Proof of pregnancy").
-
- Pay | Key facts
- -|-
- Average weekly earnings | £<%= number_with_precision(average_weekly_earnings, precision: 7) %> (don't round this up or down)
- Latest date to claim SMP | <%= format_date(notice_request_pay) %>
- SMP start date due to pregnancy related illness| <%= format_date(ssp_stop) %>
- Proof of pregnancy | Usually within 21 days of the SMP start date (or as soon as possible if baby born early)
-
- %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
-
-
- ## SMP calculation
-
- Date | SMP amount
- -|-
- <%= pay_dates_and_pay %>
- | **Total SMP: <%= format_money(total_smp) %>**
-
- <% end %>
-
- *[SMP]: Statutory Maternity Pay
-<% end %>
-
-<% render_content_for :next_steps do %>
- Read the [guide to Statutory Maternity Pay and Leave](/employers-maternity-pay-leave)
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.erb
new file mode 100644
index 00000000000..a4b709ae4df
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.erb
@@ -0,0 +1,70 @@
+<% govspeak_for :body do %>
+ <% if has_contract == "no" %>
+ <%= render partial: 'paternity_not_entitled_to_leave' %>
+ <% else %>
+ <%= render partial: 'paternity_entitled_to_leave',
+ locals: {
+ leave_type: calculator.leave_type,
+ leave_start_date: leave_start_date,
+ leave_end_date: leave_end_date,
+ leave_spp_claim_link: leave_spp_claim_link,
+ notice_of_leave_deadline: notice_of_leave_deadline
+ } %>
+ <% end %>
+
+ <% unless above_lower_earning_limit %>
+ <%= render partial: 'paternity_not_entitled_to_pay_intro' %>
+
+ + <%= render partial: 'must_earn_over_threshold',
+ locals: {
+ average_weekly_earnings: average_weekly_earnings,
+ relevant_period: relevant_period,
+ lower_earning_limit: lower_earning_limit
+ } %>
+
+ <%= render partial: 'paternity_not_entitled_to_pay_outro' %>
+ <% else %>
+ <% if leave_type == "adoption" %>
+ ##Statutory Adoption Pay (SAP)
+
+ The employee is entitled to SAP.
+
+ Their average weekly earnings are: <%= format_money(average_weekly_earnings) %>
+
+ ## SAP calculation
+
+ Date | SAP amount
+ -|-
+ <%= pay_dates_and_pay %>
+ | **Total SAP: <%= format_money(total_spp) %>**
+
+ <% else %>
+ ##Statutory Paternity Pay (SPP)
+
+ The employee is entitled to SPP.
+
+ Their average weekly earnings are: <%= format_money(average_weekly_earnings) %>
+
+ ## SPP calculation
+
+ Date | SPP amount
+ -|-
+ <%= pay_dates_and_pay %>
+ | **Total SPP: <%= format_money(total_spp) %>**
+
+ <% end %>
+
+ %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
+
+ <%= render partial: 'spp_claim_link',
+ locals: {leave_type: leave_type} %>
+ <% end %>
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ <% if leave_type == "adoption" %>
+ Read the [guide to Statutory Adoption Pay and Leave](/employers-adoption-pay-leave)
+ <% else %>
+ Read the [guide to Statutory Paternity Pay and Leave](/employers-paternity-pay-leave)
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.govspeak.erb
deleted file mode 100644
index 7f6f33e884e..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_leave_and_pay.govspeak.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-<% render_content_for :body do %>
- <% if has_contract == "no" %>
- <%= render partial: 'paternity_not_entitled_to_leave.govspeak.erb' %>
- <% else %>
- <%= render partial: 'paternity_entitled_to_leave.govspeak.erb',
- locals: {
- leave_type: calculator.leave_type,
- leave_start_date: leave_start_date,
- leave_end_date: leave_end_date,
- leave_spp_claim_link: leave_spp_claim_link,
- notice_of_leave_deadline: notice_of_leave_deadline
- } %>
- <% end %>
-
- <% unless above_lower_earning_limit %>
- <%= render partial: 'paternity_not_entitled_to_pay_intro.govspeak.erb' %>
-
- + <%= render partial: 'must_earn_over_threshold.govspeak.erb',
- locals: {
- average_weekly_earnings: average_weekly_earnings,
- relevant_period: relevant_period,
- lower_earning_limit: lower_earning_limit
- } %>
-
- <%= render partial: 'paternity_not_entitled_to_pay_outro.govspeak.erb' %>
- <% else %>
- <% if leave_type == "adoption" %>
- ##Statutory Adoption Pay (SAP)
-
- The employee is entitled to SAP.
-
- Their average weekly earnings are: <%= format_money(average_weekly_earnings) %>
-
- ## SAP calculation
-
- Date | SAP amount
- -|-
- <%= pay_dates_and_pay %>
- | **Total SAP: <%= format_money(total_spp) %>**
-
- <% else %>
- ##Statutory Paternity Pay (SPP)
-
- The employee is entitled to SPP.
-
- Their average weekly earnings are: <%= format_money(average_weekly_earnings) %>
-
- ## SPP calculation
-
- Date | SPP amount
- -|-
- <%= pay_dates_and_pay %>
- | **Total SPP: <%= format_money(total_spp) %>**
-
- <% end %>
-
- %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).%
-
- <%= render partial: 'spp_claim_link.govspeak.erb',
- locals: {leave_type: leave_type} %>
- <% end %>
-<% end %>
-
-<% render_content_for :next_steps do %>
- <% if leave_type == "adoption" %>
- Read the [guide to Statutory Adoption Pay and Leave](/employers-adoption-pay-leave)
- <% else %>
- Read the [guide to Statutory Paternity Pay and Leave](/employers-paternity-pay-leave)
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.erb
new file mode 100644
index 00000000000..72c5004b14f
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.erb
@@ -0,0 +1,63 @@
+<% govspeak_for :body do %>
+ <% if (has_contract == 'yes' || has_contract == 'no') &&
+ (calculator.on_payroll == 'no' || employed_dob == 'no') %>
+ <% if has_contract == 'no' %>
+ <%= render partial: 'paternity_not_entitled_to_leave' %>
+ <% elsif has_contract == 'yes' %>
+ <%= render partial: 'paternity_entitled_to_leave',
+ locals: {
+ leave_type: calculator.leave_type,
+ leave_start_date: leave_start_date,
+ leave_end_date: leave_end_date,
+ leave_spp_claim_link: leave_spp_claim_link,
+ notice_of_leave_deadline: notice_of_leave_deadline
+ } %>
+ <% end %>
+
+ <%= render partial: 'paternity_not_entitled_to_pay_intro' %>
+
+ <% if calculator.on_payroll == 'no' %>
+ + <%= render partial: 'must_be_on_payroll' %>
+ <% elsif employed_dob == 'no' %>
+ <% case leave_type %>
+ <% when 'paternity' %>
+ + they must still be employed by you on <%= format_date(due_date) %>
+ <% when 'paternity_adoption' %>
+ + they must still be employed by you on <%= ap_adoption_date_formatted %>
+ <% end %>
+
+ <% end %>
+
+ <%= render partial: 'paternity_not_entitled_to_pay_outro' %>
+ <% else %>
+ ##Not entitled to Statutory Paternity Pay or Leave
+
+ The employee is not entitled to Statutory Paternity Leave or Pay because:
+
+ <% if paternity_responsible == 'no' %>
+ <% case leave_type %>
+ <% when 'paternity' %>
+
+ + aren't responsible for the child's upbringing or the biological father or mother's partner
+ <% when 'paternity_adoption' %>
+
+ + aren’t responsible for the child’s upbringing or the adopter’s partner
+ <% end %>
+
+ <% end %>
+ <% if paternity_employment_start == "no" %>
+
+ + <%= render partial: 'not_worked_long_enough',
+ locals: {employment_start: employment_start} %>
+ <% end %>
+
+ You must write confirming this. Also, send them form SPP1 confirming they’re not entitled to pay within 28 days of their pay request.
+
+ $D [Download Form SPP1, refusing Statutory Paternity Pay (PDF, 100KB)](http://www.hmrc.gov.uk/forms/spp1.pdf) $D
+
+ <% end %>
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ Read the [guide to Statutory Adoption Pay and Leave](/employers-adoption-pay-leave)
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.govspeak.erb
deleted file mode 100644
index 57a3aa5b32c..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/outcomes/paternity_not_entitled_to_leave_or_pay.govspeak.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-<% render_content_for :body do %>
- <% if (has_contract == 'yes' || has_contract == 'no') &&
- (calculator.on_payroll == 'no' || employed_dob == 'no') %>
- <% if has_contract == 'no' %>
- <%= render partial: 'paternity_not_entitled_to_leave.govspeak.erb' %>
- <% elsif has_contract == 'yes' %>
- <%= render partial: 'paternity_entitled_to_leave.govspeak.erb',
- locals: {
- leave_type: calculator.leave_type,
- leave_start_date: leave_start_date,
- leave_end_date: leave_end_date,
- leave_spp_claim_link: leave_spp_claim_link,
- notice_of_leave_deadline: notice_of_leave_deadline
- } %>
- <% end %>
-
- <%= render partial: 'paternity_not_entitled_to_pay_intro.govspeak.erb' %>
-
- <% if calculator.on_payroll == 'no' %>
- + <%= render partial: 'must_be_on_payroll.govspeak.erb' %>
- <% elsif employed_dob == 'no' %>
- <% case leave_type %>
- <% when 'paternity' %>
- + they must still be employed by you on <%= format_date(due_date) %>
- <% when 'paternity_adoption' %>
- + they must still be employed by you on <%= ap_adoption_date_formatted %>
- <% end %>
-
- <% end %>
-
- <%= render partial: 'paternity_not_entitled_to_pay_outro.govspeak.erb' %>
- <% else %>
- ##Not entitled to Statutory Paternity Pay or Leave
-
- The employee is not entitled to Statutory Paternity Leave or Pay because:
-
- <% if paternity_responsible == 'no' %>
- <% case leave_type %>
- <% when 'paternity' %>
-
- + aren't responsible for the child's upbringing or the biological father or mother's partner
- <% when 'paternity_adoption' %>
-
- + aren’t responsible for the child’s upbringing or the adopter’s partner
- <% end %>
-
- <% end %>
- <% if paternity_employment_start == "no" %>
-
- + <%= render partial: 'not_worked_long_enough.govspeak.erb',
- locals: {employment_start: employment_start} %>
- <% end %>
-
- You must write confirming this. Also, send them form SPP1 confirming they’re not entitled to pay within 28 days of their pay request.
-
- $D [Download Form SPP1, refusing Statutory Paternity Pay (PDF, 100KB)](http://www.hmrc.gov.uk/forms/spp1.pdf) $D
-
- <% end %>
-<% end %>
-
-<% render_content_for :next_steps do %>
- Read the [guide to Statutory Adoption Pay and Leave](/employers-adoption-pay-leave)
-<% 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
new file mode 100644
index 00000000000..c8bad41c636
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.erb
@@ -0,0 +1,3 @@
+<% text_for :error_message do %>
+ Use numbers like 12.34
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.govspeak.erb
deleted file mode 100644
index e4354c32f40..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :error_message do %>
- Use numbers like 12.34
-<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/_payday_question_hint.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/_payday_question_hint.erb
similarity index 100%
rename from lib/smart_answer_flows/maternity-paternity-calculator/questions/_payday_question_hint.govspeak.erb
rename to lib/smart_answer_flows/maternity-paternity-calculator/questions/_payday_question_hint.erb
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
new file mode 100644
index 00000000000..0f6dcbb73ea
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ When does the employee want to start their leave?
+<% end %>
+
+<% text_for :hint do %>
+ Leave can’t start before <%= a_leave_earliest_start_formatted %> or after <%= a_leave_latest_start_formatted %>.
+<% end %>
+
+<% text_for :error_leave_starts_too_early do %>
+ Leave can’t start before <%= a_leave_earliest_start_formatted %>.
+<% end %>
+
+<% 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_date_leave_starts.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.govspeak.erb
deleted file mode 100644
index 9e6ed5278ea..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- When does the employee want to start their leave?
-<% end %>
-
-<% render_content_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 %>
- Leave can’t start before <%= a_leave_earliest_start_formatted %>.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..fc4e1dafebd
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+ Did the employee work for you on or before <%= format_date(employment_start) %>?
+ <% end %>
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.govspeak.erb
deleted file mode 100644
index 53e7c0fe80d..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
- Did the employee work for you on or before <%= format_date(employment_start) %>?
- <% end %>
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..6afbcaeeb35
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does the employee have an employment contract with you?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.govspeak.erb
deleted file mode 100644
index 3abc669c06a..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does the employee have an employment contract with you?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..3b580cd8f2c
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Will the child be coming from overseas?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes",
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.govspeak.erb
deleted file mode 100644
index 46ee1008cd9..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Will the child be coming from overseas?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes",
-) %>
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
new file mode 100644
index 00000000000..0b710a9c0a4
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.govspeak.erb
deleted file mode 100644
index adb1771e76d..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..d6c38484f30
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What is the actual birth date?
+<% end %>
+
+<% text_for :hint do %>
+ If unknown enter the due date.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.govspeak.erb
deleted file mode 100644
index 0b15b5ded82..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What is the actual birth date?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..780cc9d768b
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.erb
@@ -0,0 +1,3 @@
+<% 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_maternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.govspeak.erb
deleted file mode 100644
index 94d485d1d07..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..780cc9d768b
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.erb
@@ -0,0 +1,3 @@
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.govspeak.erb
deleted file mode 100644
index 94d485d1d07..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..a2f85e18700
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When does the employee want to start their leave?
+<% end %>
+
+<% text_for :hint do %>
+ Based on the baby's due date, leave usually can’t start before <%= format_date(leave_earliest_start_date) %>.
+<% end %>
+
+<% text_for :error_message do %>
+ Please enter a valid date
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.govspeak.erb
deleted file mode 100644
index efe7883fd69..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When does the employee want to start their leave?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..e2dd15159f6
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ <% if adoption_is_from_overseas %>
+ When did the employee get permission to adopt?
+ <% else %>
+ When was the child matched with the employee?
+ <% end %>
+<% end %>
+
+<% if adoption_is_from_overseas %>
+ <% 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_match.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.govspeak.erb
deleted file mode 100644
index 44e3a49a342..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- <% if adoption_is_from_overseas %>
- When did the employee get permission to adopt?
- <% else %>
- When was the child matched with the employee?
- <% end %>
-<% end %>
-
-<% if adoption_is_from_overseas %>
- <% render_content_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
new file mode 100644
index 00000000000..4ce0d2da0fd
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ <% if adoption_is_from_overseas %>
+ When will the child arrive in the UK?
+ <% else %>
+ When will the child be placed with the employee?
+ <% end %>
+<% end %>
+
+<% text_for :error_message do %>
+ <% if adoption_is_from_overseas %>
+ Arrival date can’t be before official notification date
+ <% else %>
+ Placement date can't be before matching date
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.govspeak.erb
deleted file mode 100644
index d2cdaa0ef8b..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- <% if adoption_is_from_overseas %>
- When will the child arrive in the UK?
- <% else %>
- When will the child be placed with the employee?
- <% end %>
-<% end %>
-
-<% render_content_for :error_message do %>
- <% if adoption_is_from_overseas %>
- Arrival date can’t be before official notification date
- <% else %>
- Placement date can't be before matching date
- <% end %>
-<% end %>
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
new file mode 100644
index 00000000000..691ca07f7ca
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What particular day of the month is the employee paid?
+<% end %>
+
+<% options(
+ "0": "Sunday",
+ "1": "Monday",
+ "2": "Tuesday",
+ "3": "Wednesday",
+ "4": "Thursday",
+ "5": "Friday",
+ "6": "Saturday"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.govspeak.erb
deleted file mode 100644
index 366c5ca224c..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What particular day of the month is the employee paid?
-<% end %>
-
-<% options(
- "0": "Sunday",
- "1": "Monday",
- "2": "Tuesday",
- "3": "Wednesday",
- "4": "Thursday",
- "5": "Friday",
- "6": "Saturday"
-) %>
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
new file mode 100644
index 00000000000..42c93918aa8
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What days does the employee work?
+<% end %>
+
+<% options(
+ "0": "Sunday",
+ "1": "Monday",
+ "2": "Tuesday",
+ "3": "Wednesday",
+ "4": "Thursday",
+ "5": "Friday",
+ "6": "Saturday"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.govspeak.erb
deleted file mode 100644
index d082b34e985..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What days does the employee work?
-<% end %>
-
-<% options(
- "0": "Sunday",
- "1": "Monday",
- "2": "Tuesday",
- "3": "Wednesday",
- "4": "Thursday",
- "5": "Friday",
- "6": "Saturday"
-) %>
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
new file mode 100644
index 00000000000..a4a387efedd
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the employee work for you on or before <%= format_date(employment_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.govspeak.erb
deleted file mode 100644
index f059fea39ae..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the employee work for you on or before <%= format_date(employment_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..1114139d044
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Did the employee have a contract with you covering
+ <%= format_date(employment_start) %> to
+ <%= format_date(qualifying_week_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+ ) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.govspeak.erb
deleted file mode 100644
index 27931481189..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Did the employee have a contract with you covering
- <%= format_date(employment_start) %> to
- <%= format_date(qualifying_week_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
- ) %>
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
new file mode 100644
index 00000000000..f0abd45cb97
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Does the employee have an employment contract with you now?
+<% end %>
+
+<% text_for :hint do %>
+ This includes written and verbal contracts.
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+ ) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.govspeak.erb
deleted file mode 100644
index 549ecc7b738..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Does the employee have an employment contract with you now?
-<% end %>
-
-<% render_content_for :hint do %>
- This includes written and verbal contracts.
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
- ) %>
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
new file mode 100644
index 00000000000..dfda9e88170
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What were the employee’s total earnings between <%= relevant_period %>?
+<% end %>
+
+<% text_for :hint do %>
+ This is their earnings before deductions like PAYE, pension or National Insurance contributions.
+<% end %>
+
+<%= render partial: 'earnings_question_error_message' %>
+
+<% content_for :post_body do %>
+ For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.govspeak.erb
deleted file mode 100644
index 3180ad69cbe..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What were the employee’s total earnings between <%= relevant_period %>?
-<% end %>
-
-<% render_content_for :hint do %>
- This is their earnings before deductions like PAYE, pension or National Insurance contributions.
-<% end %>
-
-<%= render partial: 'earnings_question_error_message.govspeak.erb' %>
-
-<% content_for :post_body do %>
- For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
-<% 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
new file mode 100644
index 00000000000..dfda9e88170
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What were the employee’s total earnings between <%= relevant_period %>?
+<% end %>
+
+<% text_for :hint do %>
+ This is their earnings before deductions like PAYE, pension or National Insurance contributions.
+<% end %>
+
+<%= render partial: 'earnings_question_error_message' %>
+
+<% content_for :post_body do %>
+ For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.govspeak.erb
deleted file mode 100644
index 3180ad69cbe..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What were the employee’s total earnings between <%= relevant_period %>?
-<% end %>
-
-<% render_content_for :hint do %>
- This is their earnings before deductions like PAYE, pension or National Insurance contributions.
-<% end %>
-
-<%= render partial: 'earnings_question_error_message.govspeak.erb' %>
-
-<% content_for :post_body do %>
- For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
-<% 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
new file mode 100644
index 00000000000..b4fabd8914a
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What were the employee's total earnings between <%= relevant_period %>?
+<% end %>
+
+<% text_for :hint do %>
+ This is the earnings before deductions like PAYE, pension or National Insurance contributions.
+<% end %>
+
+<%= render partial: 'earnings_question_error_message' %>
+
+<% content_for :post_body do %>
+ For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.govspeak.erb
deleted file mode 100644
index a1026629432..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What were the employee's total earnings between <%= relevant_period %>?
-<% end %>
-
-<% render_content_for :hint do %>
- This is the earnings before deductions like PAYE, pension or National Insurance contributions.
-<% end %>
-
-<%= render partial: 'earnings_question_error_message.govspeak.erb' %>
-
-<% content_for :post_body do %>
- For leave starting after 25 April 2020: if your employee earned less than usual because they were 'on furlough' under the Coronavirus Job Retention Scheme, enter what they would have earned normally.
-<% 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
new file mode 100644
index 00000000000..1b9048cb74c
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.erb
@@ -0,0 +1,3 @@
+<% 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_date_matched_paternity_adoption.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.govspeak.erb
deleted file mode 100644
index a7d35e25f80..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..6afbcaeeb35
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does the employee have an employment contract with you?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.govspeak.erb
deleted file mode 100644
index 3abc669c06a..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does the employee have an employment contract with you?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..0b710a9c0a4
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.govspeak.erb
deleted file mode 100644
index adb1771e76d..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..3dd2e82c502
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How long is the employee's paternity leave?
+<% end %>
+
+<% options(
+ "one_week": "One week",
+ "two_weeks": "Two weeks"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.govspeak.erb
deleted file mode 100644
index d19587acd2b..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How long is the employee's paternity leave?
-<% end %>
-
-<% options(
- "one_week": "One week",
- "two_weeks": "Two weeks"
-) %>
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
new file mode 100644
index 00000000000..459cd7a0477
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.erb
@@ -0,0 +1,8 @@
+<% 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 %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.govspeak.erb
deleted file mode 100644
index 5f8793d7f1b..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..b5114565ad3
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ When does the employee want to start their paternity leave?
+<% end %>
+
+<% text_for :hint do %>
+ Leave cannot start before <%= start_leave_hint %>.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.govspeak.erb
deleted file mode 100644
index a96104b180f..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- When does the employee want to start their paternity leave?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..5475e7c6bf2
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Will the employee still be employed by you on <%= format_date(still_employed_date) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.govspeak.erb
deleted file mode 100644
index 9c2e153d23d..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Will the employee still be employed by you on <%= format_date(still_employed_date) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..a4a387efedd
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the employee work for you on or before <%= format_date(employment_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.govspeak.erb
deleted file mode 100644
index f059fea39ae..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the employee work for you on or before <%= format_date(employment_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..6afbcaeeb35
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Does the employee have an employment contract with you?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.govspeak.erb
deleted file mode 100644
index 3abc669c06a..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Does the employee have an employment contract with you?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..a3a39103e02
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How do you want the adoption pay calculated?
+<% end %>
+
+<% options(
+ "weekly_starting": "Weekly starting #{format_date(leave_start_date)}",
+ "usual_paydates": "Based on their usual paydates"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.govspeak.erb
deleted file mode 100644
index 65c1f5f8fe9..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How do you want the adoption pay calculated?
-<% end %>
-
-<% options(
- "weekly_starting": "Weekly starting #{format_date(leave_start_date)}",
- "usual_paydates": "Based on their usual paydates"
-) %>
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
new file mode 100644
index 00000000000..b339f3e5678
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How do you want the Statutory Maternity Pay calculated?
+<% end %>
+
+<% options(
+ "weekly_starting": "weekly starting #{format_date(leave_start_date)}",
+ "usual_paydates": "based on their usual paydates"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.govspeak.erb
deleted file mode 100644
index 4000b041fe8..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How do you want the Statutory Maternity Pay calculated?
-<% end %>
-
-<% options(
- "weekly_starting": "weekly starting #{format_date(leave_start_date)}",
- "usual_paydates": "based on their usual paydates"
-) %>
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
new file mode 100644
index 00000000000..62e46b80a4a
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How do you want the paternity pay calculated?
+<% end %>
+
+<% options(
+ "weekly_starting": "Weekly starting #{format_date(leave_start_date)}",
+ "usual_paydates": "Based on their usual paydates"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.govspeak.erb
deleted file mode 100644
index 7d941513db6..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How do you want the paternity pay calculated?
-<% end %>
-
-<% options(
- "weekly_starting": "Weekly starting #{format_date(leave_start_date)}",
- "usual_paydates": "Based on their usual paydates"
-) %>
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
new file mode 100644
index 00000000000..9ecdf0a7489
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How many fortnightly payments did the employee receive between <%= relevant_period %>?
+<% end %>
+
+<% options(payment_options_every_2_weeks) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.govspeak.erb
deleted file mode 100644
index 32eb685608e..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How many fortnightly payments did the employee receive between <%= relevant_period %>?
-<% end %>
-
-<% options(payment_options_every_2_weeks) %>
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
new file mode 100644
index 00000000000..53ad6efa407
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.erb
@@ -0,0 +1,5 @@
+<% text_for :title do %>
+ How many payments did the employee receive between <%= relevant_period %>?
+<% end %>
+
+<% options(payment_options_every_4_weeks) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.govspeak.erb
deleted file mode 100644
index a08541a7724..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :title do %>
- How many payments did the employee receive between <%= relevant_period %>?
-<% end %>
-
-<% options(payment_options_every_4_weeks) %>
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
new file mode 100644
index 00000000000..ef81e384eca
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ How many months' pay did the employee get between <%= relevant_period %>?
+<% end %>
+
+<% 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 %>
+
+<% options(payment_options_monthly) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.govspeak.erb
deleted file mode 100644
index a792d9a35bb..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- How many months' pay did the employee get between <%= relevant_period %>?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(payment_options_monthly) %>
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
new file mode 100644
index 00000000000..049de198279
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ How many weeks' pay did the employee get between <%= relevant_period %>?
+<% end %>
+
+<% 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 %>
+
+<% options(payment_options_weekly) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.govspeak.erb
deleted file mode 100644
index e4347797034..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- How many weeks' pay did the employee get between <%= relevant_period %>?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(payment_options_weekly) %>
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
new file mode 100644
index 00000000000..0b710a9c0a4
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.govspeak.erb
deleted file mode 100644
index adb1771e76d..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..4882ed6c4bc
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday on or before <%= to_saturday_formatted %>?
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.govspeak.erb
deleted file mode 100644
index ecfa5cf5bcd..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday on or before <%= to_saturday_formatted %>?
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..4882ed6c4bc
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday on or before <%= to_saturday_formatted %>?
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.govspeak.erb
deleted file mode 100644
index ecfa5cf5bcd..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday on or before <%= to_saturday_formatted %>?
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..04da0b888ca
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday on or before <%= to_saturday_formatted %>
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.govspeak.erb
deleted file mode 100644
index b8ec1c5b750..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday on or before <%= to_saturday_formatted %>
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0f0493d61c5
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is the employee taking paternity leave or pay to adopt a child?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.govspeak.erb
deleted file mode 100644
index a185d77dfdc..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is the employee taking paternity leave or pay to adopt a child?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..abc37289875
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ When in the month is the employee paid?
+<% end %>
+
+<% options(
+ "first_day_of_the_month": "First day of the month",
+ "last_day_of_the_month": "Last day of the month",
+ "specific_date_each_month": "Specific date each month",
+ "last_working_day_of_the_month": "Last working day of the month",
+ "a_certain_week_day_each_month": "A certain week day each month"
+) %>
+
+<% 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/monthly_pay_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.govspeak.erb
deleted file mode 100644
index 3df9a718fa9..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- When in the month is the employee paid?
-<% end %>
-
-<% options(
- "first_day_of_the_month": "First day of the month",
- "last_day_of_the_month": "Last day of the month",
- "specific_date_each_month": "Specific date each month",
- "last_working_day_of_the_month": "Last working day of the month",
- "a_certain_week_day_each_month": "A certain week day each month"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..b2f1aa9fad9
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.erb
@@ -0,0 +1,3 @@
+<% 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/next_pay_day_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.govspeak.erb
deleted file mode 100644
index 022566475e0..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..de425e040c1
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ When will the child be placed with the employee?
+<% end %>
+
+<% 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_date_of_adoption_placement.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.govspeak.erb
deleted file mode 100644
index 81091b2f9bf..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- When will the child be placed with the employee?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..ef6c20b1655
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.erb
@@ -0,0 +1,8 @@
+<% 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 %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.govspeak.erb
deleted file mode 100644
index f5e7d1f26aa..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..e6ab5bfc155
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
+<% end %>
+
+<% options(
+ "first": "1st",
+ "second": "2nd",
+ "third": "3rd",
+ "fourth": "4th",
+ "last": "last"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.govspeak.erb
deleted file mode 100644
index 4077411c903..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
-<% end %>
-
-<% options(
- "first": "1st",
- "second": "2nd",
- "third": "3rd",
- "fourth": "4th",
- "last": "last"
-) %>
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
new file mode 100644
index 00000000000..6ea31cd9767
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How often do you pay the employee?
+<% end %>
+
+<% options(
+ "weekly": "Weekly",
+ "every_2_weeks": "Every 2 weeks",
+ "every_4_weeks": "Every 4 weeks",
+ "monthly": "Monthly"
+) %>
+
+<% govspeak_for :body do %>
+ If you don’t pay your employee on the same day every pay period, you’ll need to [work out their Statutory Maternity Pay manually](/guidance/statutory-maternity-pay-manually-calculate-your-employees-payments).
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.govspeak.erb
deleted file mode 100644
index 9372075ddbf..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay the employee?
-<% end %>
-
-<% options(
- "weekly": "Weekly",
- "every_2_weeks": "Every 2 weeks",
- "every_4_weeks": "Every 4 weeks",
- "monthly": "Monthly"
-) %>
-
-<% render_content_for :body do %>
- If you don’t pay your employee on the same day every pay period, you’ll need to [work out their Statutory Maternity Pay manually](/guidance/statutory-maternity-pay-manually-calculate-your-employees-payments).
-<% 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
new file mode 100644
index 00000000000..55ccdccb645
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How often do you pay the employee?
+<% end %>
+
+<% options(
+ "weekly": "Weekly",
+ "every_2_weeks": "Every 2 weeks",
+ "every_4_weeks": "Every 4 weeks",
+ "monthly": "Monthly"
+) %>
+
+<% 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_adoption.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.govspeak.erb
deleted file mode 100644
index 746062ea244..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay the employee?
-<% end %>
-
-<% options(
- "weekly": "Weekly",
- "every_2_weeks": "Every 2 weeks",
- "every_4_weeks": "Every 4 weeks",
- "monthly": "Monthly"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..88cb173e16b
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How often do you pay the employee?
+<% end %>
+
+<% options(
+ "weekly": "Weekly",
+ "every_2_weeks": "Every 2 weeks",
+ "every_4_weeks": "Every 4 weeks",
+ "monthly": "Monthly"
+) %>
+
+<% text_for :hint do %>
+ If they are paid irregularly choose 'weekly'.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.govspeak.erb
deleted file mode 100644
index f1f9a4a7f70..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay the employee?
-<% end %>
-
-<% options(
- "weekly": "Weekly",
- "every_2_weeks": "Every 2 weeks",
- "every_4_weeks": "Every 4 weeks",
- "monthly": "Monthly"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0a6834bee61
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday before <%= payday_offset_formatted %>?
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.govspeak.erb
deleted file mode 100644
index da3a3a81110..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday before <%= payday_offset_formatted %>?
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0a6834bee61
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday before <%= payday_offset_formatted %>?
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.govspeak.erb
deleted file mode 100644
index da3a3a81110..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday before <%= payday_offset_formatted %>?
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..4cf93739cfb
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What was the last normal payday before <%= payday_offset_formatted %>
+<% end %>
+
+<% text_for :hint do %>
+ <%= render partial: 'payday_question_hint' %>
+<% end %>
+
+<% 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/payday_eight_weeks_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.govspeak.erb
deleted file mode 100644
index 6a743e1a133..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What was the last normal payday before <%= payday_offset_formatted %>
-<% end %>
-
-<% render_content_for :hint do %>
- <%= render partial: 'payday_question_hint.govspeak.erb' %>
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..5b563e4a22d
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What specific date each month is the employee paid?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Enter a date between 1 and 31.
+<% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.govspeak.erb
deleted file mode 100644
index cf6f74c723a..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What specific date each month is the employee paid?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..f4eca968185
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+Is the employee taking paternity or maternity leave to adopt a child?
+<% end %>
+
+<% options(
+ "maternity": "Maternity",
+ "paternity": "Paternity"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.govspeak.erb
deleted file mode 100644
index 1b4ae208812..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
-Is the employee taking paternity or maternity leave to adopt a child?
-<% end %>
-
-<% options(
- "maternity": "Maternity",
- "paternity": "Paternity"
-) %>
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
new file mode 100644
index 00000000000..42c93918aa8
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What days does the employee work?
+<% end %>
+
+<% options(
+ "0": "Sunday",
+ "1": "Monday",
+ "2": "Tuesday",
+ "3": "Wednesday",
+ "4": "Thursday",
+ "5": "Friday",
+ "6": "Saturday"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.govspeak.erb
deleted file mode 100644
index d082b34e985..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What days does the employee work?
-<% end %>
-
-<% options(
- "0": "Sunday",
- "1": "Monday",
- "2": "Tuesday",
- "3": "Wednesday",
- "4": "Thursday",
- "5": "Friday",
- "6": "Saturday"
-) %>
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
new file mode 100644
index 00000000000..7ccbea94935
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What particular day of the month is the employee paid?
+<% end %>
+
+<% options(
+ "Sunday": "Sunday",
+ "Monday": "Monday",
+ "Tuesday": "Tuesday",
+ "Wednesday": "Wednesday",
+ "Thursday": "Thursday",
+ "Friday": "Friday",
+ "Saturday": "Saturday"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.govspeak.erb
deleted file mode 100644
index c8856dd831b..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What particular day of the month is the employee paid?
-<% end %>
-
-<% options(
- "Sunday": "Sunday",
- "Monday": "Monday",
- "Tuesday": "Tuesday",
- "Wednesday": "Wednesday",
- "Thursday": "Thursday",
- "Friday": "Friday",
- "Saturday": "Saturday"
-) %>
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
new file mode 100644
index 00000000000..a445f3d7098
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What specific date each month is the employee paid?
+<% end %>
+
+<% 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 %>
+
+<% 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_specific_date_each_month_is_the_employee_paid.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.govspeak.erb
deleted file mode 100644
index 81b164dc8f8..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What specific date each month is the employee paid?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..54430fab025
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ What do you want to check?
+<% end %>
+
+<% options(
+ "maternity": "Maternity",
+ "paternity": "Paternity",
+ "adoption": "Adoption"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.govspeak.erb
deleted file mode 100644
index df9c8121900..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- What do you want to check?
-<% end %>
-
-<% options(
- "maternity": "Maternity",
- "paternity": "Paternity",
- "adoption": "Adoption"
-) %>
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
new file mode 100644
index 00000000000..abc37289875
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ When in the month is the employee paid?
+<% end %>
+
+<% options(
+ "first_day_of_the_month": "First day of the month",
+ "last_day_of_the_month": "Last day of the month",
+ "specific_date_each_month": "Specific date each month",
+ "last_working_day_of_the_month": "Last working day of the month",
+ "a_certain_week_day_each_month": "A certain week day each month"
+) %>
+
+<% 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_in_the_month_is_the_employee_paid.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.govspeak.erb
deleted file mode 100644
index 3df9a718fa9..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- When in the month is the employee paid?
-<% end %>
-
-<% options(
- "first_day_of_the_month": "First day of the month",
- "last_day_of_the_month": "Last day of the month",
- "specific_date_each_month": "Specific date each month",
- "last_working_day_of_the_month": "Last working day of the month",
- "a_certain_week_day_each_month": "A certain week day each month"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..23182fdf0d6
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.erb
@@ -0,0 +1,3 @@
+<% 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/when_is_your_employees_next_pay_day.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.govspeak.erb
deleted file mode 100644
index 8c014e49403..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..e6ab5bfc155
--- /dev/null
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
+<% end %>
+
+<% options(
+ "first": "1st",
+ "second": "2nd",
+ "third": "3rd",
+ "fourth": "4th",
+ "last": "last"
+) %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.govspeak.erb
deleted file mode 100644
index 4077411c903..00000000000
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
-<% end %>
-
-<% options(
- "first": "1st",
- "second": "2nd",
- "third": "3rd",
- "fourth": "4th",
- "last": "last"
-) %>
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
new file mode 100644
index 00000000000..a62dc1d305a
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ National Minimum Wage and Living Wage calculator for employers
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Check if:
+
+ - you’re paying a worker the National Minimum Wage
+ - you’re paying a worker the National Living Wage
+ - you owe your employee payments from the previous year because you underpaid them
+
+ ^Your employee must be at least 25 years old to get the national living wage.^
+
+Check [National Minimum Wage and National Living Wage rates](/national-minimum-wage-rates) before March 2019
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb
deleted file mode 100644
index 6fa7b251939..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- National Minimum Wage and Living Wage calculator for employers
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Check if:
-
- - you’re paying a worker the National Minimum Wage
- - you’re paying a worker the National Living Wage
- - you owe your employee payments from the previous year because you underpaid them
-
- ^Your employee must be at least 25 years old to get the national living wage.^
-
-Check [National Minimum Wage and National Living Wage rates](/national-minimum-wage-rates) before March 2019
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.erb
new file mode 100644
index 00000000000..a0d607c7616
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ $C
+ <% if calculator.eligible_for_living_wage? %>
+ Based on your answers, you appear to be paying the National Living Wage.
+ <% else %>
+ Based on your answers, you appear to be paying the National Minimum Wage.
+ <% end %>
+ $C
+
+ <% if calculator.potential_underpayment? %>
+ As you’ve taken money from the worker’s pay for things they need for their job or not been paying the worker for any additional time they worked outside of their shift, this might mean you’ve underpaid them.
+ <% end%>
+
+ Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb
deleted file mode 100644
index aeaee8d0238..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- $C
- <% if calculator.eligible_for_living_wage? %>
- Based on your answers, you appear to be paying the National Living Wage.
- <% else %>
- Based on your answers, you appear to be paying the National Minimum Wage.
- <% end %>
- $C
-
- <% if calculator.potential_underpayment? %>
- As you’ve taken money from the worker’s pay for things they need for their job or not been paying the worker for any additional time they worked outside of their shift, this might mean you’ve underpaid them.
- <% end%>
-
- Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.erb
new file mode 100644
index 00000000000..f29c26fd897
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.erb
@@ -0,0 +1,22 @@
+<% govspeak_for :body do %>
+ $C
+ <% if calculator.eligible_for_living_wage? %>
+ Based on your answers, you appear to be not paying the National Living Wage.
+ <% else %>
+ Based on your answers, you appear to be not paying the National Minimum Wage.
+ <% end %>
+ $C
+
+ This is because you are not paying the [minimum rate](/national-minimum-wage-rates) the worker is entitled to.
+
+ <% if calculator.potential_underpayment? %>
+ You could have also:
+
+ * taken money from the worker’s pay for things they needed for their job
+ * not paid the worker for any additional time they worked outside their shift
+ <% end %>
+
+ Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb
deleted file mode 100644
index b65269f82c8..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% render_content_for :body do %>
- $C
- <% if calculator.eligible_for_living_wage? %>
- Based on your answers, you appear to be not paying the National Living Wage.
- <% else %>
- Based on your answers, you appear to be not paying the National Minimum Wage.
- <% end %>
- $C
-
- This is because you are not paying the [minimum rate](/national-minimum-wage-rates) the worker is entitled to.
-
- <% if calculator.potential_underpayment? %>
- You could have also:
-
- * taken money from the worker’s pay for things they needed for their job
- * not paid the worker for any additional time they worked outside their shift
- <% end %>
-
- Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.erb
new file mode 100644
index 00000000000..b301325850f
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ There was no National Minimum Wage rate for apprentices before 1 October 2010. Your don't owe the worker any past payments.
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb
deleted file mode 100644
index f0f82ff66d4..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- There was no National Minimum Wage rate for apprentices before 1 October 2010. Your don't owe the worker any past payments.
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.erb
new file mode 100644
index 00000000000..9c24191d769
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ $C
+ Based on your answers, you appear to have been paying National Minimum Wage.
+
+ <% if calculator.potential_underpayment? %>
+ As you have taken money from the worker’s pay for things they needed for their job or not paid the worker for any additional time they worked outside of their shift, this might mean you have underpaid them.
+ <%end %>
+ $C
+
+ Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.govspeak.erb
deleted file mode 100644
index b39c15a0202..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- $C
- Based on your answers, you appear to have been paying National Minimum Wage.
-
- <% if calculator.potential_underpayment? %>
- As you have taken money from the worker’s pay for things they needed for their job or not paid the worker for any additional time they worked outside of their shift, this might mean you have underpaid them.
- <%end %>
- $C
-
- Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.erb
new file mode 100644
index 00000000000..87c10639e1a
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ $C
+ Based on your answers, you appear not to have been paying the National Minimum Wage.
+ $C
+
+ This is because you were not paying the [minimum rate](/national-minimum-wage-rates) the worker was entitled to.
+
+ <% if calculator.potential_underpayment? %>
+ You could also have further underpaid the worker if you:
+
+ * took money from their pay for things they needed for their job
+ * did not pay them for any additional time they worked outside their shift
+ <% end%>
+
+ Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
+
+ <%= render partial: 'shared/minimum_wage/acas_information' %>
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.govspeak.erb
deleted file mode 100644
index de13d3027a1..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- $C
- Based on your answers, you appear not to have been paying the National Minimum Wage.
- $C
-
- This is because you were not paying the [minimum rate](/national-minimum-wage-rates) the worker was entitled to.
-
- <% if calculator.potential_underpayment? %>
- You could also have further underpaid the worker if you:
-
- * took money from their pay for things they needed for their job
- * did not pay them for any additional time they worked outside their shift
- <% end%>
-
- Read the guidance on [how to calculate the National Minimum Wage](/national-minimum-wage/employers-and-the-minimum-wage).
-
- <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.erb
new file mode 100644
index 00000000000..a4b151192a7
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ The worker must be at least [school leaving age](/know-when-you-can-leave-school) to be entitled to the National Minimum Wage.
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.govspeak.erb
deleted file mode 100644
index 3d01f53652b..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- The worker must be at least [school leaving age](/know-when-you-can-leave-school) to be entitled to the National Minimum Wage.
-<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.erb
new file mode 100644
index 00000000000..6d4fe4d1362
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ The worker must have been at least [school leaving age](/know-when-you-can-leave-school) at the time to be entitled to the National Minimum Wage.
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.govspeak.erb
deleted file mode 100644
index 7a1acadcd58..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- The worker must have been at least [school leaving age](/know-when-you-can-leave-school) at the time to be entitled to the National Minimum Wage.
-<% 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
new file mode 100644
index 00000000000..314bc87a616
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Is the worker an apprentice?
+<% end %>
+
+<% options(
+ "not_an_apprentice": "Not an apprentice",
+ "apprentice_under_19": "Apprentice under 19",
+ "apprentice_over_19_first_year": "Apprentice aged 19 and over in their first year",
+ "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in their second year or onwards"
+) %>
+
+<% 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/are_you_an_apprentice.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.govspeak.erb
deleted file mode 100644
index e308c7044ae..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- Is the worker an apprentice?
-<% end %>
-
-<% options(
- "not_an_apprentice": "Not an apprentice",
- "apprentice_under_19": "Apprentice under 19",
- "apprentice_over_19_first_year": "Apprentice aged 19 and over in their first year",
- "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in their second year or onwards"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..91b8354b2cd
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much do you charge for accommodation per day?
+<% end %>
+
+<% 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_charge.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.govspeak.erb
deleted file mode 100644
index a592f80c9ce..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How much do you charge for accommodation per day?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..69ccfab4784
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How many days per week does the worker live in the accommodation?
+<% end %>
+
+<% 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_accommodation_usage.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.govspeak.erb
deleted file mode 100644
index 6c35c53be04..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How many days per week does the worker live in the accommodation?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..b9643432a43
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Does the worker work additional time outside of their shift?
+<% end %>
+
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.govspeak.erb
deleted file mode 100644
index bce43db4838..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Does the worker work additional time outside of their shift?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..7687f8e7f7f
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you pay the worker for the additional time they worked outside of their shift?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.govspeak.erb
deleted file mode 100644
index df76050c8e9..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you pay the worker for the additional time they worked outside of their shift?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..9ffd28f9974
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Did you take money from your worker’s pay for things they needed for their job?
+<% end %>
+
+<% 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.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.govspeak.erb
deleted file mode 100644
index 7b8ae056b5b..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_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 %>
- 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.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..2299bce55e4
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ Do you take money from your worker’s pay for things they need for their job?
+<% end %>
+
+<% 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.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.govspeak.erb
deleted file mode 100644
index dd639dba340..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_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 %>
- 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.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..674afd52d1c
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How many hours did the worker work during the pay period?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
+<% 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_did_you_work.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.govspeak.erb
deleted file mode 100644
index e166da33d17..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How many hours did the worker work during the pay period?
-<% end %>
-
-<% render_content_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 %>
- Please enter a number
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..329ede0b6d0
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ How many hours does the worker work during the pay period?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
+<% 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_many_hours_do_you_work.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.govspeak.erb
deleted file mode 100644
index 80f5f7f6a9e..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- How many hours does the worker work during the pay period?
-<% end %>
-
-<% render_content_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 %>
- Please enter a number
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..ed767954d4d
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much do you pay the worker in the pay period?
+<% end %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Please enter a number
+<% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.govspeak.erb
deleted file mode 100644
index ddd510d713a..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much do you pay the worker in the pay period?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..66ebad428ea
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much did you pay the worker in the pay period?
+<% end %>
+
+<% 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 %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.govspeak.erb
deleted file mode 100644
index 97f84a3e398..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much did you pay the worker in the pay period?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..d62df47dc7c
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ How often did you pay the worker?
+<% end %>
+
+<% text_for :hint do %>
+ The pay period in days
+<% end %>
+
+
+<% 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_did_you_get_paid.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.govspeak.erb
deleted file mode 100644
index d5e4d88a0c3..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- How often did you pay the worker?
-<% end %>
-
-<% render_content_for :hint do %>
- The pay period in days
-<% end %>
-
-
-<% render_content_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
new file mode 100644
index 00000000000..ace8853f314
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How often do you pay the worker?
+<% end %>
+
+<% text_for :hint do %>
+ The pay period in days
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.govspeak.erb
deleted file mode 100644
index 24a06a5e889..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How often do you pay the worker?
-<% end %>
-
-<% render_content_for :hint do %>
- The pay period in days
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..c5071dd36de
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How old is the worker?
+<% end %>
+
+<% text_for :suffix_label do %>
+ years old
+<% end %>
+
+<% 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_are_you.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.govspeak.erb
deleted file mode 100644
index 259c34a0c93..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How old is the worker?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- years old
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..5a274da0352
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How old was the worker at the time?
+<% end %>
+
+<% text_for :suffix_label do %>
+ years old
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.govspeak.erb
deleted file mode 100644
index ff005d4fcbd..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How old was the worker at the time?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- years old
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..7398218abd2
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Do you provide accommodation?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes_free": "Yes, the accommodation is free",
+ "yes_charged": "Yes, the accommodation is charged for"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.govspeak.erb
deleted file mode 100644
index cc64835312d..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Do you provide accommodation?
-<% end %>
-
-<% options(
- "no": "No",
- "yes_free": "Yes, the accommodation is free",
- "yes_charged": "Yes, the accommodation is charged for"
-) %>
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
new file mode 100644
index 00000000000..76740d6c9fe
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much did you charge for accommodation per day?
+<% end %>
+
+<% 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_charge.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.govspeak.erb
deleted file mode 100644
index 1fe29ce4133..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How much did you charge for accommodation per day?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a49cda12f2c
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How many days per week did the worker live in the accommodation?
+<% end %>
+
+<% 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_accommodation_usage.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.govspeak.erb
deleted file mode 100644
index 37b2ebfbfd7..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How many days per week did the worker live in the accommodation?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..126d4154146
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Did the worker work additional time outside of their shift?
+<% end %>
+
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.govspeak.erb
deleted file mode 100644
index d6c40af134b..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Did the worker work additional time outside of their shift?
-<% end %>
-
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..bfcc2b636d9
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did you pay the worker for the additional time they worked outside of their shift?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.govspeak.erb
deleted file mode 100644
index 60a68cf7e54..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did you pay the worker for the additional time they worked outside of their shift?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4ca2ae02aa9
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Did you provide accommodation?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes_free": "Yes, the accommodation was free",
+ "yes_charged": "Yes, the accommodation was charged for"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.govspeak.erb
deleted file mode 100644
index ec999c4099e..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Did you provide accommodation?
-<% end %>
-
-<% options(
- "no": "No",
- "yes_free": "Yes, the accommodation was free",
- "yes_charged": "Yes, the accommodation was charged for"
-) %>
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
new file mode 100644
index 00000000000..eaf5bd10229
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Was the worker an apprentice at the time?
+<% end %>
+
+<% options(
+ "no": "No",
+ "apprentice_under_19": "Apprentice under 19",
+ "apprentice_over_19": "Apprentice aged 19 and over and in their first year"
+) %>
+
+<% 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/were_you_an_apprentice.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.govspeak.erb
deleted file mode 100644
index c51bc06f79f..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Was the worker an apprentice at the time?
-<% end %>
-
-<% options(
- "no": "No",
- "apprentice_under_19": "Apprentice under 19",
- "apprentice_over_19": "Apprentice aged 19 and over and in their first year"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..5fa1e45e444
--- /dev/null
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ What would you like to check?
+<% end %>
+
+<% options(
+ "current_payment": "If you’re paying a worker the National Minimum Wage or the National Living Wage",
+ "past_payment": "If you owe a worker payments from last year (April 2019 to March 2020)"
+) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb
deleted file mode 100644
index 387dfa417e6..00000000000
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- What would you like to check?
-<% end %>
-
-<% options(
- "current_payment": "If you’re paying a worker the National Minimum Wage or the National Living Wage",
- "past_payment": "If you owe a worker payments from last year (April 2019 to March 2020)"
-) %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.erb
new file mode 100644
index 00000000000..703d032268a
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.erb
@@ -0,0 +1,28 @@
+<% govspeak_for :body do %>
+ %Your part-year taxable profit is <%= format_money(calculator.award_period_taxable_profit) %>.%
+
+ Use this figure to complete box 2.4 on your award review. Enter £0 if you’ve made or expect to make a loss (your part-year profit is less than £0).
+
+ ^If you have more than one business, you need to calculate the part-year profits from all your businesses and add them together to complete box 2.4.^
+
+ You may be able to [make deductions from this amount](/end-tax-credits-claim/self-employed).
+
+ You’ll have to work out your part-year taxable profit [using the helpsheet](/government/publications/tax-credits-ending-your-award-when-you-claim-universal-credit) that came with your Award Review if:
+
+ - you changed your accounting period part way through the year
+ - your profits are based on a longer period or for example, you're a farmer, a foster carer or have foreign income
+
+ ## Your part-year taxable profit has been worked out from:
+
+ Your tax credits award ended on: <%= format_date(calculator.tax_credits_award_ends_on) %>
+
+ <% if calculator.stopped_trading_on %>
+ Your business stopped trading on: <%= format_date(calculator.basis_period.ends_on) %>
+ <% else %>
+ Your business accounts end on: <%= format_date(calculator.basis_period.ends_on) %>
+ <% end %>
+
+ Your estimated taxable profit between <%= format_date(calculator.basis_period.begins_on) %> and <%= format_date(calculator.basis_period.ends_on) %> was: <%= format_money(calculator.taxable_profit) %>
+
+ ^You must [keep the records](/self-employed-records/how-long-to-keep-your-records) of your calculation for at least 5 years.^
+<% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.govspeak.erb
deleted file mode 100644
index 0b3bc80fa25..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/outcomes/result.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :body do %>
- %Your part-year taxable profit is <%= format_money(calculator.award_period_taxable_profit) %>.%
-
- Use this figure to complete box 2.4 on your award review. Enter £0 if you’ve made or expect to make a loss (your part-year profit is less than £0).
-
- ^If you have more than one business, you need to calculate the part-year profits from all your businesses and add them together to complete box 2.4.^
-
- You may be able to [make deductions from this amount](/end-tax-credits-claim/self-employed).
-
- You’ll have to work out your part-year taxable profit [using the helpsheet](/government/publications/tax-credits-ending-your-award-when-you-claim-universal-credit) that came with your Award Review if:
-
- - you changed your accounting period part way through the year
- - your profits are based on a longer period or for example, you're a farmer, a foster carer or have foreign income
-
- ## Your part-year taxable profit has been worked out from:
-
- Your tax credits award ended on: <%= format_date(calculator.tax_credits_award_ends_on) %>
-
- <% if calculator.stopped_trading_on %>
- Your business stopped trading on: <%= format_date(calculator.basis_period.ends_on) %>
- <% else %>
- Your business accounts end on: <%= format_date(calculator.basis_period.ends_on) %>
- <% end %>
-
- Your estimated taxable profit between <%= format_date(calculator.basis_period.begins_on) %> and <%= format_date(calculator.basis_period.ends_on) %> was: <%= format_money(calculator.taxable_profit) %>
-
- ^You must [keep the records](/self-employed-records/how-long-to-keep-your-records) of your calculation for at least 5 years.^
-<% 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
new file mode 100644
index 00000000000..b436f381957
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Calculate your part-year profits to finalise your tax credits
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ You need to report your part-year profits to end your Tax Credits claim because of a claim to Universal Credit and you’re self-employed.
+
+ You’ll need to know the following to use this calculator:
+
+ - your Tax Credits award end date (you can find this on your award review)
+ - your accounting dates for your business
+ - your accounting year profit for the tax year in which your tax credits award ends
+
+ You can use this calculator to complete box 2.4 of your award review.
+<% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.govspeak.erb
deleted file mode 100644
index 210e34a33c9..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Calculate your part-year profits to finalise your tax credits
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- You need to report your part-year profits to end your Tax Credits claim because of a claim to Universal Credit and you’re self-employed.
-
- You’ll need to know the following to use this calculator:
-
- - your Tax Credits award end date (you can find this on your award review)
- - your accounting dates for your business
- - your accounting year profit for the tax year in which your tax credits award ends
-
- You can use this calculator to complete box 2.4 of your award review.
-<% 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
new file mode 100644
index 00000000000..230ae555b54
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Did you start trading before <%= format_date(accounting_year_begins_on) %>?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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/did_you_start_trading_before_the_relevant_accounting_year.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.govspeak.erb
deleted file mode 100644
index 8691b820eb1..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Did you start trading before <%= format_date(accounting_year_begins_on) %>?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..d6bcc621f18
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Do your accounts cover the 12 month period up to <%= format_date(accounting_year_ends_on) %>?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.govspeak.erb
deleted file mode 100644
index 59a967aee5c..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Do your accounts cover the 12 month period up to <%= format_date(accounting_year_ends_on) %>?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..11d9556a1ad
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Have you stopped trading?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% text_for :hint do %>
+ This means you’re no longer running your business.
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.govspeak.erb
deleted file mode 100644
index 24ef464033e..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Have you stopped trading?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :hint do %>
- This means you’re no longer running your business.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..2289ffaff9b
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What date do your accounts go up to?
+<% end %>
+
+<% 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 %>
+
+<% 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_date_do_your_accounts_go_up_to.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.govspeak.erb
deleted file mode 100644
index f2b3940baaf..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What date do your accounts go up to?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..c72fe4f1305
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% 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 %>
+
+<% text_for :error_message do %>
+ Enter your taxable profit.
+<% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.govspeak.erb
deleted file mode 100644
index 7e2feccb5ad..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..644cf823165
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ When did you start trading?
+<% end %>
+
+<% text_for :hint do %>
+ This date must be before <%= format_date(award_period_ends_on) %>.
+<% end %>
+
+<% text_for :error_message do %>
+ You need to enter a date to continue.
+<% end %>
+<% 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_start_trading.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.govspeak.erb
deleted file mode 100644
index 5b25bf30a8e..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- When did you start trading?
-<% end %>
-
-<% render_content_for :hint do %>
- This date must be before <%= format_date(award_period_ends_on) %>.
-<% end %>
-
-<% render_content_for :error_message do %>
- You need to enter a date to continue.
-<% end %>
-<% render_content_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
new file mode 100644
index 00000000000..f6156ee751e
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ When did you stop trading?
+<% end %>
+
+<% 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 %>
+
+<% 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 %>
+<% 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_you_stop_trading.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.govspeak.erb
deleted file mode 100644
index df7554fe9af..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- When did you stop trading?
-<% end %>
-
-<% render_content_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 %>
- 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 %>
- 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
new file mode 100644
index 00000000000..023ca6afba1
--- /dev/null
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When did your Tax Credits award end?
+<% end %>
+
+<% text_for :hint do %>
+ You can find this on your award review.
+<% end %>
+
+<% 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.govspeak.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.govspeak.erb
deleted file mode 100644
index bc74519907a..00000000000
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When did your Tax Credits award end?
-<% end %>
-
-<% render_content_for :hint do %>
- You can find this on your award review.
-<% end %>
-
-<% render_content_for :error_message do %>
- You need to enter a date to continue.
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_additional_pat_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_birth_nothing.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_birth_nothing.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_birth_nothing.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_birth_nothing.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_both_shared_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_extra_help.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_extra_help.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_extra_help.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_extra_help.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.erb
new file mode 100644
index 00000000000..726630304cd
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.erb
@@ -0,0 +1,59 @@
+##Maternity allowance
+
+The mother can get [maternity allowance](/maternity-allowance) from the government for up to 39 weeks.
+
+<%= render partial: 'statutory_maternity_pay_warning' %>
+
+###Dates and amounts
+
+Maternity allowance can start on | <%= format_date(calculator.start_of_maternity_allowance) %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2013) %>
+
+Weekly rate (between 6 April 2013 and 5 April 2014) | £136.78, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2014) %>
+
+Weekly rate (between 6 April 2014 and 5 April 2015) | £138.18, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2015) %>
+
+Weekly rate (between 6 April 2015 and 5 April 2016) | £139.58, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2016) %>
+
+Weekly rate (between 6 April 2016 and 5 April 2017) | £139.58, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2017) %>
+
+Weekly rate (between 6 April 2017 and 5 April 2018) | £140.98, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2018) %>
+
+Weekly rate (between 6 April 2018 and 5 April 2019) | £145.18, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2019) %>
+
+Weekly rate (between 6 April 2019 and 5 April 2020) | £148.68, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+<% if calculator.paid_leave_is_in_tax_year?(2020) %>
+
+Weekly rate (between 6 April 2020 and 5 April 2021) | £151.20, or 90% of her average weekly earnings (whichever is lower)
+
+<% end %>
+
+The mother can claim maternity allowance as soon as she’s been pregnant for 26 weeks. She won’t have to pay tax on it.
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.govspeak.erb
deleted file mode 100644
index 331ce150009..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-##Maternity allowance
-
-The mother can get [maternity allowance](/maternity-allowance) from the government for up to 39 weeks.
-
-<%= render partial: 'statutory_maternity_pay_warning.govspeak.erb' %>
-
-###Dates and amounts
-
-Maternity allowance can start on | <%= format_date(calculator.start_of_maternity_allowance) %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2013) %>
-
-Weekly rate (between 6 April 2013 and 5 April 2014) | £136.78, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2014) %>
-
-Weekly rate (between 6 April 2014 and 5 April 2015) | £138.18, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2015) %>
-
-Weekly rate (between 6 April 2015 and 5 April 2016) | £139.58, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2016) %>
-
-Weekly rate (between 6 April 2016 and 5 April 2017) | £139.58, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2017) %>
-
-Weekly rate (between 6 April 2017 and 5 April 2018) | £140.98, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2018) %>
-
-Weekly rate (between 6 April 2018 and 5 April 2019) | £145.18, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2019) %>
-
-Weekly rate (between 6 April 2019 and 5 April 2020) | £148.68, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-<% if calculator.paid_leave_is_in_tax_year?(2020) %>
-
-Weekly rate (between 6 April 2020 and 5 April 2021) | £151.20, or 90% of her average weekly earnings (whichever is lower)
-
-<% end %>
-
-The mother can claim maternity allowance as soon as she’s been pregnant for 26 weeks. She won’t have to pay tax on it.
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.erb
new file mode 100644
index 00000000000..d885cb4bfe6
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.erb
@@ -0,0 +1,13 @@
+##Maternity allowance
+
+The mother can get [maternity allowance](/maternity-allowance) from the government for up to 14 weeks.
+
+<%= render partial: 'statutory_maternity_pay_warning' %>
+
+ | Dates and amounts
+- | -
+Maternity allowance can start on | <%= format_date(calculator.start_of_maternity_allowance) %>
+Weekly rate | £27
+Total allowance | £378
+
+The mother can claim maternity allowance as soon as she’s been pregnant for 26 weeks. She won’t have to pay tax on it.
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.govspeak.erb
deleted file mode 100644
index ccd2253c7b3..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_allowance_14_weeks.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-##Maternity allowance
-
-The mother can get [maternity allowance](/maternity-allowance) from the government for up to 14 weeks.
-
-<%= render partial: 'statutory_maternity_pay_warning.govspeak.erb' %>
-
- | Dates and amounts
-- | -
-Maternity allowance can start on | <%= format_date(calculator.start_of_maternity_allowance) %>
-Weekly rate | £27
-Total allowance | £378
-
-The mother can claim maternity allowance as soon as she’s been pregnant for 26 weeks. She won’t have to pay tax on it.
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_mat_shared_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_leave.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_leave.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_leave.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_pay.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_pay.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_pat_shared_pay.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_single_birth_nothing.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_single_birth_nothing.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_single_birth_nothing.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_single_birth_nothing.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_statutory_maternity_pay_warning.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/_statutory_maternity_pay_warning.erb
similarity index 100%
rename from lib/smart_answer_flows/pay-leave-for-parents/outcomes/_statutory_maternity_pay_warning.govspeak.erb
rename to lib/smart_answer_flows/pay-leave-for-parents/outcomes/_statutory_maternity_pay_warning.erb
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.erb
new file mode 100644
index 00000000000..ea9a83250ce
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'birth_nothing' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.govspeak.erb
deleted file mode 100644
index 2afcc771310..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_birth_nothing.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'birth_nothing.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.erb
new file mode 100644
index 00000000000..a2b05e98cda
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.govspeak.erb
deleted file mode 100644
index 61b65b7a388..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.erb
new file mode 100644
index 00000000000..9846ecc0b1c
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance_14_weeks', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.govspeak.erb
deleted file mode 100644
index 2f8eda14d84..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_14_weeks.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance_14_weeks.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.erb
new file mode 100644
index 00000000000..dc3332d5ae2
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.govspeak.erb
deleted file mode 100644
index cf9b70d516b..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.erb
new file mode 100644
index 00000000000..31fe4fc0c79
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.govspeak.erb
deleted file mode 100644
index 61da162c9ca..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_mat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.erb
new file mode 100644
index 00000000000..435087a0862
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.govspeak.erb
deleted file mode 100644
index 0536d08e557..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.erb
new file mode 100644
index 00000000000..28d7c7504ee
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'both_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.govspeak.erb
deleted file mode 100644
index 3f894b140c7..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_both_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'both_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
new file mode 100644
index 00000000000..00af9e2dddb
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
deleted file mode 100644
index 9c30ce6cbcc..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.erb
new file mode 100644
index 00000000000..7fee5fd1a1d
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'both_shared_leave' %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 3c0d7c91442..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_both_shared_leave_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'both_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb
new file mode 100644
index 00000000000..3c30578d9da
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 0f43d37ddf7..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.erb
new file mode 100644
index 00000000000..024a4e4c78f
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.govspeak.erb
deleted file mode 100644
index 96dc8b614d4..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_leave_pat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.erb
new file mode 100644
index 00000000000..527b181527b
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.govspeak.erb
deleted file mode 100644
index b0657152930..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.erb
new file mode 100644
index 00000000000..4925bee81a2
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 05b6288b3f3..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_mat_shared_leave_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.erb
new file mode 100644
index 00000000000..7c15ab9d80b
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 8c473a1f5b6..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_mat_leave_pat_pay_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.erb
new file mode 100644
index 00000000000..4ee6c2f4a13
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.govspeak.erb
deleted file mode 100644
index ae33d5b220d..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
new file mode 100644
index 00000000000..0d04588b000
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
deleted file mode 100644
index 70ca8724c69..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb
new file mode 100644
index 00000000000..984110ac7a4
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 462eb6ed2f4..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_pay_pat_shared_leave_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.erb
new file mode 100644
index 00000000000..ab7362cfc59
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.govspeak.erb
deleted file mode 100644
index 1f50ee68b2d..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_leave_pat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.erb
new file mode 100644
index 00000000000..1dcc50bc060
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.govspeak.erb
deleted file mode 100644
index 70060f9c78f..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.erb
new file mode 100644
index 00000000000..132785ba505
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_allowance', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.govspeak.erb
deleted file mode 100644
index 4a34f2fa227..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_allowance_pat_pay_pat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_allowance.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.erb
new file mode 100644
index 00000000000..3e014c47b13
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.govspeak.erb
deleted file mode 100644
index 8424e7bac28..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.erb
new file mode 100644
index 00000000000..b5adf0a3b8f
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.govspeak.erb
deleted file mode 100644
index 4084ea577b6..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.erb
new file mode 100644
index 00000000000..325100a9590
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'mat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.govspeak.erb
deleted file mode 100644
index caffc883bbe..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_mat_shared_leave_mat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'mat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.erb
new file mode 100644
index 00000000000..c5923633a8f
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.govspeak.erb
deleted file mode 100644
index 697e64b9ce5..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.erb
new file mode 100644
index 00000000000..5436b2e6bad
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'both_shared_leave' %>
+
+ <%= render partial: 'mat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.govspeak.erb
deleted file mode 100644
index 25ec115b81f..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_both_shared_leave_mat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'both_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'mat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
new file mode 100644
index 00000000000..3224449ef48
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
deleted file mode 100644
index c09016909d4..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.erb
new file mode 100644
index 00000000000..89653637f55
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'both_shared_leave' %>
+
+ <%= render partial: 'both_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.govspeak.erb
deleted file mode 100644
index 269f0f9e800..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_pay_both_shared_leave_both_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'both_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'both_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.erb
new file mode 100644
index 00000000000..7b72a78ad30
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.govspeak.erb
deleted file mode 100644
index a8ea68a2b13..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_leave_pat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.erb
new file mode 100644
index 00000000000..3adf9f6a80b
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.govspeak.erb
deleted file mode 100644
index 42649ac0a85..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.erb
new file mode 100644
index 00000000000..61dcf334989
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'both_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.govspeak.erb
deleted file mode 100644
index 87b23892c9e..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_pay_pat_pay_mat_shared_leave_both_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'both_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.erb
new file mode 100644
index 00000000000..aff6416a7cf
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.govspeak.erb
deleted file mode 100644
index 3ef1a1cd57d..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_mat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.erb
new file mode 100644
index 00000000000..66391039abd
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.govspeak.erb
deleted file mode 100644
index bd8f417145f..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.erb
new file mode 100644
index 00000000000..0580950a1be
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.govspeak.erb
deleted file mode 100644
index bb874724eed..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.erb
new file mode 100644
index 00000000000..ea59c84cba4
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.govspeak.erb
deleted file mode 100644
index a84202f38c1..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_mat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.erb
new file mode 100644
index 00000000000..75adc543990
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.govspeak.erb
deleted file mode 100644
index 5eeb1dae6ad..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.erb
new file mode 100644
index 00000000000..b108040720a
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.govspeak.erb
deleted file mode 100644
index e511a30ca7f..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.erb
new file mode 100644
index 00000000000..18a2a7f0f50
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.govspeak.erb
deleted file mode 100644
index 19f57964107..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_leave_pat_pay_mat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.erb
new file mode 100644
index 00000000000..afef3ca1fbb
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.govspeak.erb
deleted file mode 100644
index 6e5ac139734..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.erb
new file mode 100644
index 00000000000..c24b1661937
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.govspeak.erb
deleted file mode 100644
index f591e4cbeb6..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_leave_pat_pay_mat_shared_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.erb
new file mode 100644
index 00000000000..5bfd8a530f9
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.govspeak.erb
deleted file mode 100644
index 28c827494df..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.erb
new file mode 100644
index 00000000000..a894f60059a
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'mat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.govspeak.erb
deleted file mode 100644
index 5457d0a8a25..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_mat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'mat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.erb
new file mode 100644
index 00000000000..8a18176ecbd
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.govspeak.erb
deleted file mode 100644
index bc896266332..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.erb
new file mode 100644
index 00000000000..85c1e93d293
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.govspeak.erb
deleted file mode 100644
index 29d3985c627..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_additional_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
new file mode 100644
index 00000000000..44f18c02781
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_leave' %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
deleted file mode 100644
index d73e9726b23..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_additional_pat_leave_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_leave.govspeak.erb' %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.erb
new file mode 100644
index 00000000000..5d2b4eecf91
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'both_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.govspeak.erb
deleted file mode 100644
index 2a51e9ffff3..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_pay_pat_shared_leave_both_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'both_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.erb
new file mode 100644
index 00000000000..204860f1536
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_shared_leave' %>
+
+ <%= render partial: 'mat_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.govspeak.erb
deleted file mode 100644
index b9247b21bca..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_leave_pat_shared_leave_mat_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_shared_leave.govspeak.erb' %>
-
- <%= render partial: 'mat_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.erb
new file mode 100644
index 00000000000..029c89a3a26
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'additional_pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.govspeak.erb
deleted file mode 100644
index 5d67b90c0a6..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_additional_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'additional_pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.erb
new file mode 100644
index 00000000000..571b85a1126
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'mat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'both_shared_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.govspeak.erb
deleted file mode 100644
index 26e5d3d17aa..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_mat_pay_pat_pay_both_shared_pay.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'mat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'both_shared_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.erb
new file mode 100644
index 00000000000..a01e6476619
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.govspeak.erb
deleted file mode 100644
index 33150b7e78b..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.erb
new file mode 100644
index 00000000000..d10f777ee30
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'pat_leave', locals: { calculator: calculator } %>
+
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.govspeak.erb
deleted file mode 100644
index 67b5aebed26..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_leave_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'pat_leave.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.erb
new file mode 100644
index 00000000000..8cde7c9521d
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'pat_pay', locals: { calculator: calculator } %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.govspeak.erb
deleted file mode 100644
index 2a101e118d5..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_pat_pay.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'pat_pay.govspeak.erb', locals: { calculator: calculator } %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.erb
new file mode 100644
index 00000000000..0672a3cf1cc
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'single_birth_nothing' %>
+
+ <%= render partial: 'extra_help' %>
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.govspeak.erb
deleted file mode 100644
index 89146ae343b..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/outcomes/outcome_single_birth_nothing.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'single_birth_nothing.govspeak.erb' %>
-
- <%= render partial: 'extra_help.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..8db4a720ecf
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.erb
@@ -0,0 +1,27 @@
+<% text_for :title do %>
+ Check if you can get leave or pay when you have a child
+<% end %>
+
+<% text_for :meta_description do %>
+ Pay and leave for parents
+<% end %>
+
+<% govspeak_for :body do %>
+ Find out:
+
+ * if you can get maternity, paternity or shared parental leave
+ * how much pay you can get if you take leave
+
+ ## Before you start
+
+ You’ll need to know:
+
+ * your employment status (for example employed or worker)
+ * the date you started your current job
+ * the date you finished work (if you’ve finished)
+ * how much you earn
+
+ You’ll need the same information about your partner if you plan to share the care of the child with them.
+
+ ^Use this calculator once for each job you have.^
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.govspeak.erb
deleted file mode 100644
index b5445e7d17e..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :title do %>
- Check if you can get leave or pay when you have a child
-<% end %>
-
-<% render_content_for :meta_description do %>
- Pay and leave for parents
-<% end %>
-
-<% render_content_for :body do %>
- Find out:
-
- * if you can get maternity, paternity or shared parental leave
- * how much pay you can get if you take leave
-
- ## Before you start
-
- You’ll need to know:
-
- * your employment status (for example employed or worker)
- * the date you started your current job
- * the date you finished work (if you’ve finished)
- * how much you earn
-
- You’ll need the same information about your partner if you plan to share the care of the child with them.
-
- ^Use this calculator once for each job you have.^
-<% 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
new file mode 100644
index 00000000000..5613389b900
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.erb
@@ -0,0 +1,3 @@
+<% 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/_warning_hint.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.govspeak.erb
deleted file mode 100644
index 617e6ddfa29..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..e5a6e3f1cf2
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ When is the baby due?
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.govspeak.erb
deleted file mode 100644
index 14c6d14c3a8..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..9a5f343c1cf
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ What’s the employment status of the mother?
+<% end %>
+
+<% options(
+ "employee": "Employee",
+ "worker": "Worker or agency worker",
+ "self-employed": "Self-employed",
+ "unemployed": "Unemployed"
+) %>
+
+<% govspeak_for :post_body do %>
+ Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.govspeak.erb
deleted file mode 100644
index 3c0ad87da0e..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- What’s the employment status of the mother?
-<% end %>
-
-<% options(
- "employee": "Employee",
- "worker": "Worker or agency worker",
- "self-employed": "Self-employed",
- "unemployed": "Unemployed"
-) %>
-
-<% render_content_for :post_body do %>
- Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
-<% 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
new file mode 100644
index 00000000000..4fc6469d57a
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ What’s the employment status of the mother’s partner?
+<% end %>
+
+<% options(
+ "employee": "Employee",
+ "worker": "Worker or agency worker",
+ "self-employed": "Self-employed",
+ "unemployed": "Unemployed"
+) %>
+
+<% govspeak_for :post_body do %>
+ Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.govspeak.erb
deleted file mode 100644
index eafac1c609b..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- What’s the employment status of the mother’s partner?
-<% end %>
-
-<% options(
- "employee": "Employee",
- "worker": "Worker or agency worker",
- "self-employed": "Self-employed",
- "unemployed": "Unemployed"
-) %>
-
-<% render_content_for :post_body do %>
- Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
-<% 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
new file mode 100644
index 00000000000..4ddf21ca1cb
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.erb
@@ -0,0 +1,15 @@
+<% 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 %>
+The 13 weeks do not need to be in a row.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :post_body do %>
+ For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.govspeak.erb
deleted file mode 100644
index 093d95351a7..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_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 %>
-The 13 weeks do not need to be in a row.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :post_body do %>
- For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
-<% end %>
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
new file mode 100644
index 00000000000..2b3f5766854
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% content_for :post_body do %>
+ For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.govspeak.erb
deleted file mode 100644
index 0b24bc963a1..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% content_for :post_body do %>
- For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
-<% 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
new file mode 100644
index 00000000000..28ebe2a8274
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Did the mother start her current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
+<% end %>
+
+<%= render partial: 'warning_hint' %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.govspeak.erb
deleted file mode 100644
index 74907e2a7b4..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Did the mother start her current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
-<% end %>
-
-<%= render partial: 'warning_hint.govspeak.erb' %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..697f66274fe
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was the mother (or will she be) still working in that job on <%= format_date(calculator.continuity_end_date) %>?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.govspeak.erb
deleted file mode 100644
index 411e78987db..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was the mother (or will she be) still working in that job on <%= format_date(calculator.continuity_end_date) %>?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..d6bb6947ea0
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :post_body do %>
+ The 26 weeks don’t need to be in a row. They can be full or part weeks.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.govspeak.erb
deleted file mode 100644
index a2d79b536bd..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :post_body do %>
- The 26 weeks don’t need to be in a row. They can be full or part weeks.
-<% 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
new file mode 100644
index 00000000000..6d5711788e2
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.erb
@@ -0,0 +1,15 @@
+<% 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 %>
+The 13 weeks do not need to be in a row.
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :post_body do %>
+ For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.govspeak.erb
deleted file mode 100644
index 24c4fbe601f..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_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 %>
-The 13 weeks do not need to be in a row.
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :post_body do %>
- For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
-<% end %>
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
new file mode 100644
index 00000000000..081d393d916
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% content_for :post_body do %>
+ For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.govspeak.erb
deleted file mode 100644
index acc761af8bf..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% content_for :post_body do %>
- For leave starting after 25 April 2020: if they earned less than usual in any weeks because they were 'on furlough' under the Coronavirus Job Retention Scheme, you can use what they would have earned normally.
-<% 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
new file mode 100644
index 00000000000..f8b9d8134fd
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Did the mother’s partner start their current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
+<% end %>
+
+<%= render partial: 'warning_hint' %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.govspeak.erb
deleted file mode 100644
index d0df6e55874..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Did the mother’s partner start their current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
-<% end %>
-
-<%= render partial: 'warning_hint.govspeak.erb' %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..a17430f6b47
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.erb
@@ -0,0 +1,8 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.govspeak.erb
deleted file mode 100644
index a82aa8f3e81..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..48bdd850118
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.erb
@@ -0,0 +1,12 @@
+<% 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 %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :post_body do %>
+ The 26 weeks don’t need to be in a row. They can be full or part weeks.
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.govspeak.erb
deleted file mode 100644
index a2b5528e4a0..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :post_body do %>
- The 26 weeks don’t need to be in a row. They can be full or part weeks.
-<% 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
new file mode 100644
index 00000000000..6c0d7858a12
--- /dev/null
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Will the mother care for the child with a partner?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :post_body do %>
+ The partner is one of the following:
+
+ - the mother's husband, wife or civil partner
+ - the child's other parent
+ - the mother's partner (if they live with the mother and the child)
+<% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.govspeak.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.govspeak.erb
deleted file mode 100644
index ef91347c0ca..00000000000
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Will the mother care for the child with a partner?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :post_body do %>
- The partner is one of the following:
-
- - the mother's husband, wife or civil partner
- - the child's other parent
- - the mother's partner (if they live with the mother and the child)
-<% 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
new file mode 100644
index 00000000000..74a9547cbe0
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.erb
@@ -0,0 +1,25 @@
+<% text_for :title do %>
+ Your Adoption Leave dates
+<% end %>
+
+<% govspeak_for :body do %>
+ You can take up to 52 weeks Statutory Adoption Leave.
+
+ The dates below are based on this and the date the child starts to live with you: <%= arrival_date_formatted %>.
+
+ Leave | Key dates
+ - | -
+ Ordinary Adoption Leave (first 26 weeks): | <%= period_of_ordinary_leave %>
+ Additional Adoption Leave (last 26 weeks): | <%= period_of_additional_leave %>
+ Earliest leave can start: | <%= earliest_start_formatted %>
+ Latest date to give notice: | <%= last_qualifying_week_formatted %>
+
+ You could get more time off if your employer has a company adoption leave scheme.
+
+ ##Statutory Adoption Pay
+ While on leave, you might get [Statutory Adoption Pay](/statutory-adoption-pay).
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ Read our guide to [adoption pay and leave](/adoption-pay-leave)
+<% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.govspeak.erb
deleted file mode 100644
index a109b87300a..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.govspeak.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% render_content_for :title do %>
- Your Adoption Leave dates
-<% end %>
-
-<% render_content_for :body do %>
- You can take up to 52 weeks Statutory Adoption Leave.
-
- The dates below are based on this and the date the child starts to live with you: <%= arrival_date_formatted %>.
-
- Leave | Key dates
- - | -
- Ordinary Adoption Leave (first 26 weeks): | <%= period_of_ordinary_leave %>
- Additional Adoption Leave (last 26 weeks): | <%= period_of_additional_leave %>
- Earliest leave can start: | <%= earliest_start_formatted %>
- Latest date to give notice: | <%= last_qualifying_week_formatted %>
-
- You could get more time off if your employer has a company adoption leave scheme.
-
- ##Statutory Adoption Pay
- While on leave, you might get [Statutory Adoption Pay](/statutory-adoption-pay).
-<% end %>
-
-<% render_content_for :next_steps do %>
- Read our guide to [adoption pay and leave](/adoption-pay-leave)
-<% 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
new file mode 100644
index 00000000000..ba59a6e7608
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Plan your adoption leave
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Work out your Statutory Adoption Leave notice period, earliest start date and Ordinary and Additional Adoption Leave periods based on the match and placement dates for the child.
+
+ ##What you need to know
+
+ You can’t use this tool if you’re [adopting from abroad](/adoption-leave) or taking [paternity leave for an adoption](/paternityleave).
+<% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.govspeak.erb
deleted file mode 100644
index e39ca050a36..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Plan your adoption leave
-<% end %>
-
-<% render_content_for :meta_description do %>
- Work out your Statutory Adoption Leave dates - Ordinary and Additional Adoption Leave period, notice period and earliest start date
-
-<% end %>
-
-<% render_content_for :body do %>
- Work out your Statutory Adoption Leave notice period, earliest start date and Ordinary and Additional Adoption Leave periods based on the match and placement dates for the child.
-
- ##What you need to know
-
- You can’t use this tool if you’re [adopting from abroad](/adoption-leave) or taking [paternity leave for an adoption](/paternityleave).
-<% 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
new file mode 100644
index 00000000000..5c7d7d71896
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When will the child start to live with you?
+<% end %>
+
+<% text_for :hint do %>
+ This is sometimes known as the 'date of placement'.
+<% end %>
+
+<% 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_arrival_date.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.govspeak.erb
deleted file mode 100644
index c4fa2fb40ca..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When will the child start to live with you?
-<% end %>
-
-<% render_content_for :hint do %>
- This is sometimes known as the 'date of placement'.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..395728087b9
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ When were you matched with the child?
+<% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.govspeak.erb
deleted file mode 100644
index 4688118d16c..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..5acf68a7b92
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ When do you want to start your adoption leave?
+<% end %>
+
+<% text_for :hint do %>
+ Leave can start up to 14 days before the child comes to live with you.
+<% end %>
+
+<% 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/leave_start.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.govspeak.erb
deleted file mode 100644
index 334def78a23..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- When do you want to start your adoption leave?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..f12b6c33513
--- /dev/null
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/meta.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Plan your adoption leave
+<% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/meta.govspeak.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/meta.govspeak.erb
deleted file mode 100644
index 6a8c6edd12f..00000000000
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/meta.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :title do %>
- Plan your adoption leave
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/_fees.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/_fees.erb
similarity index 100%
rename from lib/smart_answer_flows/register-a-birth/outcomes/_fees.govspeak.erb
rename to lib/smart_answer_flows/register-a-birth/outcomes/_fees.erb
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.erb
new file mode 100644
index 00000000000..ecf388a0118
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ ^You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.^
+
+ You can’t register the birth with the UK authorities. However, the birth certificate you are given in <%= calculator.registration_country_name_lowercase_prefix %> will be recognised and accepted in the UK, so this isn’t necessary.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.govspeak.erb
deleted file mode 100644
index 12ca9a0b0b2..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/commonwealth_result.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- ^You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.^
-
- You can’t register the birth with the UK authorities. However, the birth certificate you are given in <%= calculator.registration_country_name_lowercase_prefix %> will be recognised and accepted in the UK, so this isn’t necessary.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.erb
new file mode 100644
index 00000000000..cb251397102
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.erb
@@ -0,0 +1,14 @@
+<% govspeak_for :body do %>
+ $!You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.$!
+
+ You can’t usually register your child’s birth with the Foreign and Commonwealth Office (FCO) Overseas Registration Unit. This is because unmarried fathers can’t automatically pass on British nationality to a child born before 1 July 2006.
+
+ You may still be able to apply for [British citizenship](https://www.gov.uk/register-british-citizen/born-before-2006-british-father) for the child.
+
+ You may however be able to register the birth if either:
+
+ - you’ve married the other parent since the child was born (depending on the father's [legal country of domicile](/government/publications/legitimation-and-domicile) at the time of the birth)
+ - the country where the father was [legally domiciled](/government/publications/legitimation-and-domicile) at the time of the birth did not distinguish between married and unmarried parents
+
+ Contact the Overseas Registration Unit for advice at .
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.govspeak.erb
deleted file mode 100644
index d7c6c2690a8..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.$!
-
- You can’t usually register your child’s birth with the Foreign and Commonwealth Office (FCO) Overseas Registration Unit. This is because unmarried fathers can’t automatically pass on British nationality to a child born before 1 July 2006.
-
- You may still be able to apply for [British citizenship](https://www.gov.uk/register-british-citizen/born-before-2006-british-father) for the child.
-
- You may however be able to register the birth if either:
-
- - you’ve married the other parent since the child was born (depending on the father's [legal country of domicile](/government/publications/legitimation-and-domicile) at the time of the birth)
- - the country where the father was [legally domiciled](/government/publications/legitimation-and-domicile) at the time of the birth did not distinguish between married and unmarried parents
-
- Contact the Overseas Registration Unit for advice at .
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.erb
new file mode 100644
index 00000000000..9f19af3df3c
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.erb
@@ -0,0 +1,72 @@
+<% govspeak_for :body do %>
+ <% if calculator.same_country? %>
+ <% case calculator.country_of_birth %>
+ <% when 'afghanistan' %>
+ ^It’s illegal in Afghanistan to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at birthregistrationenquiries@fco.gov.uk for advice.
+ <% when 'iran' %>
+ ^It’s illegal in Iran to register the birth of a child if the parents aren't married. You can’t get a local birth certificate.^
+
+ The parents can register the birth if they get married, even if it’s after the birth.
+ <% when 'iraq' %>
+ ^It’s illegal in Iraq to register the birth of a child if the parents aren't married. You can’t get a local birth certificate.^
+
+ The parents can register the birth if they get married, even if it’s after the birth.
+ <% when 'jordan' %>
+ ^It’s illegal in Jordan to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
+ <% when 'kuwait' %>
+ ^It’s illegal in Kuwait to have a child outside of marriage or within the first 6 months of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at
+ for advice.
+ <% when 'oman' %>
+ ^It’s illegal in Oman to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
+ <% when 'pakistan' %>
+ ^It’s illegal in Pakistan to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at birthregistrationenquiries@fco.gov.uk for advice.
+ <% when 'qatar' %>
+ ^It’s illegal in Qatar to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
+ <% when 'saudi-arabia' %>
+ ^It’s illegal in Saudi Arabia to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
+ <% when 'united-arab-emirates' %>
+ ^It’s illegal in the United Arab Emirates to have a child outside of marriage. You can’t get a local birth certificate.^
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
+ <% end %>
+ <% else %>
+ <% case calculator.country_of_birth %>
+ <% when 'afghanistan' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'iran' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'iraq' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'jordan' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'kuwait' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'oman' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'pakistan' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'qatar' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'saudi-arabia' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% when 'united-arab-emirates' %>
+ You can’t get a local birth certificate if you weren’t married when you had your child.
+ <% end %>
+
+ A local birth certificate is normally needed to register an overseas birth. Contact the FCO at to find out what other proof can be accepted.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.govspeak.erb
deleted file mode 100644
index fc6f8786282..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.govspeak.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-<% render_content_for :body do %>
- <% if calculator.same_country? %>
- <% case calculator.country_of_birth %>
- <% when 'afghanistan' %>
- ^It’s illegal in Afghanistan to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at birthregistrationenquiries@fco.gov.uk for advice.
- <% when 'iran' %>
- ^It’s illegal in Iran to register the birth of a child if the parents aren't married. You can’t get a local birth certificate.^
-
- The parents can register the birth if they get married, even if it’s after the birth.
- <% when 'iraq' %>
- ^It’s illegal in Iraq to register the birth of a child if the parents aren't married. You can’t get a local birth certificate.^
-
- The parents can register the birth if they get married, even if it’s after the birth.
- <% when 'jordan' %>
- ^It’s illegal in Jordan to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
- <% when 'kuwait' %>
- ^It’s illegal in Kuwait to have a child outside of marriage or within the first 6 months of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at
- for advice.
- <% when 'oman' %>
- ^It’s illegal in Oman to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
- <% when 'pakistan' %>
- ^It’s illegal in Pakistan to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at birthregistrationenquiries@fco.gov.uk for advice.
- <% when 'qatar' %>
- ^It’s illegal in Qatar to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
- <% when 'saudi-arabia' %>
- ^It’s illegal in Saudi Arabia to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
- <% when 'united-arab-emirates' %>
- ^It’s illegal in the United Arab Emirates to have a child outside of marriage. You can’t get a local birth certificate.^
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at for advice.
- <% end %>
- <% else %>
- <% case calculator.country_of_birth %>
- <% when 'afghanistan' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'iran' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'iraq' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'jordan' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'kuwait' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'oman' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'pakistan' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'qatar' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'saudi-arabia' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% when 'united-arab-emirates' %>
- You can’t get a local birth certificate if you weren’t married when you had your child.
- <% end %>
-
- A local birth certificate is normally needed to register an overseas birth. Contact the FCO at to find out what other proof can be accepted.
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.erb
new file mode 100644
index 00000000000..99c7c07e783
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ $!You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.$!
+
+ You can’t currently register the birth with the UK authorities.
+
+ The local birth certificate, with a [certified translation](/certifying-a-document), should be acceptable for all purposes in the UK. You can apply for registration at any time in the future - check [travel advice](/foreign-travel-advice) to find out if consular services have reopened in <%= calculator.registration_country_name_lowercase_prefix %>.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.govspeak.erb
deleted file mode 100644
index adf57262954..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the birth according to the regulations in <%= calculator.registration_country_name_lowercase_prefix %>.$!
-
- You can’t currently register the birth with the UK authorities.
-
- The local birth certificate, with a [certified translation](/certifying-a-document), should be acceptable for all purposes in the UK. You can apply for registration at any time in the future - check [travel advice](/foreign-travel-advice) to find out if consular services have reopened in <%= calculator.registration_country_name_lowercase_prefix %>.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.erb
new file mode 100644
index 00000000000..725886418d6
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can’t register your child’s birth with the UK authorities. Your child must have an automatic claim to British nationality at birth to be eligible.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.govspeak.erb
deleted file mode 100644
index b30213c2ca4..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can’t register your child’s birth with the UK authorities. Your child must have an automatic claim to British nationality at birth to be eligible.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.erb
new file mode 100644
index 00000000000..09195568883
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.erb
@@ -0,0 +1,59 @@
+<% govspeak_for :body do %>
+ $!You can apply to register the birth with the British embassy in <%= calculator.registration_country_name_lowercase_prefix %>.$!
+
+ Download and complete the [birth registration form](/government/publications/application-to-register-an-overseas-birth).
+
+ ##Documents
+
+ ^Provide English translations of all foreign documents. Use a professional translator and include their name and address with your application. Don’t provide laminated documents.^
+
+ You must provide the original copies of:
+
+ - a birth certificate issued by Pyongyang Friendship Hospital
+ - the long version of the parent’s birth certificate showing the child’s grandparents’ details (for parents who were born in the UK)
+ - the parent’s naturalisation or registration certificate (for parents who weren’t born in the UK)
+ - the parents’ marriage or civil partnership certificate (if applicable)
+ - evidence that the parents’ previous marriages or civil partnerships have ended (eg divorce or death certificates)
+ - change of name documents (if either parent has ever changed their name)
+ - a letter from the parent’s employer if they’re working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
+ - written evidence if the parent was born overseas while one of their own parents was working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
+
+ You must also provide photocopies of:
+
+ - the photo page of the child’s British passport if they have one
+ - the photo page of the parent’s current passport (for British parents)
+ - the birth certificate or the photo page of the parent’s current passport (for parents who aren’t British)
+
+ %Your application will be rejected if the documents aren’t authentic, don’t confirm the child’s identity or don’t prove that the child has a claim to British nationality. The registration fee won’t be refunded.%
+
+ You’ll need to provide originals and a photocopy of each document.
+
+ ##Cost
+
+ <%= render partial: 'fees',
+ locals: { calculator: calculator } %>
+
+ You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees](/government/organisations/foreign-commonwealth-office/series/consular-fees).
+
+ You can order copies of the registration certificate from the British embassy when you register the birth.
+
+ Cheaper copies will be available from the [General Register Office](http://www.gro.gov.uk) in the UK, but not until November the year after you register.
+
+ ##Go to the British embassy
+
+ Book an appointment at the British embassy and bring the registration form, supporting documents and the fee.
+
+ <% if calculator.paternity_declaration? %>
+ The mother must register the birth. If you want the father’s name on the consular birth certificate, both parents will need to swear a paternity declaration in person at the nearest consulate.
+
+ Paternity declarations are free. Contact the consulate for more details.
+ <% else %>
+ Either parent can register the birth.
+ <% end %>
+
+ <%= render partial: 'shared/overseas_passports_embassies', locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
+
+ ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the birth will be registered.^
+
+ Your documents will be returned to the British Embassy in Pyongyang after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb
deleted file mode 100644
index eb7df42a9a8..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<% render_content_for :body do %>
- $!You can apply to register the birth with the British embassy in <%= calculator.registration_country_name_lowercase_prefix %>.$!
-
- Download and complete the [birth registration form](/government/publications/application-to-register-an-overseas-birth).
-
- ##Documents
-
- ^Provide English translations of all foreign documents. Use a professional translator and include their name and address with your application. Don’t provide laminated documents.^
-
- You must provide the original copies of:
-
- - a birth certificate issued by Pyongyang Friendship Hospital
- - the long version of the parent’s birth certificate showing the child’s grandparents’ details (for parents who were born in the UK)
- - the parent’s naturalisation or registration certificate (for parents who weren’t born in the UK)
- - the parents’ marriage or civil partnership certificate (if applicable)
- - evidence that the parents’ previous marriages or civil partnerships have ended (eg divorce or death certificates)
- - change of name documents (if either parent has ever changed their name)
- - a letter from the parent’s employer if they’re working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
- - written evidence if the parent was born overseas while one of their own parents was working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
-
- You must also provide photocopies of:
-
- - the photo page of the child’s British passport if they have one
- - the photo page of the parent’s current passport (for British parents)
- - the birth certificate or the photo page of the parent’s current passport (for parents who aren’t British)
-
- %Your application will be rejected if the documents aren’t authentic, don’t confirm the child’s identity or don’t prove that the child has a claim to British nationality. The registration fee won’t be refunded.%
-
- You’ll need to provide originals and a photocopy of each document.
-
- ##Cost
-
- <%= render partial: 'fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
- You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees](/government/organisations/foreign-commonwealth-office/series/consular-fees).
-
- You can order copies of the registration certificate from the British embassy when you register the birth.
-
- Cheaper copies will be available from the [General Register Office](http://www.gro.gov.uk) in the UK, but not until November the year after you register.
-
- ##Go to the British embassy
-
- Book an appointment at the British embassy and bring the registration form, supporting documents and the fee.
-
- <% if calculator.paternity_declaration? %>
- The mother must register the birth. If you want the father’s name on the consular birth certificate, both parents will need to swear a paternity declaration in person at the nearest consulate.
-
- Paternity declarations are free. Contact the consulate for more details.
- <% else %>
- Either parent can register the birth.
- <% end %>
-
- <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
-
- ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the birth will be registered.^
-
- Your documents will be returned to the British Embassy in Pyongyang after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.erb b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.erb
new file mode 100644
index 00000000000..369f7efec40
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.erb
@@ -0,0 +1,302 @@
+<% govspeak_for :body do %>
+ $!You must register the birth in the country where the child was born. You'll be given a local birth certificate.$!
+
+ <% if calculator.registration_country == 'indonesia' and calculator.british_national_father? and calculator.paternity_declaration? %>
+ %You’ll need to get a court order to have the father named on the birth certificate before registering if you’re unmarried and only the father has British nationality.%
+ <% end %>
+
+ <% if calculator.higher_risk_country? %>
+ <% if calculator.registration_country == 'libya' %>
+ You can also register the birth with the UK authorities.
+
+ ^It’s usually quicker to register the birth with the UK authorities if you [get a British passport](/overseas-passports) for the child first. You cannot apply for a passport in Libya but you can apply in a neighbouring country.^
+
+ To register the birth with the UK authorities you must:
+ <% else %>
+ You can also register the birth with the UK authorities.
+
+ ^It’s usually quicker to register the birth with the UK authorities if you [get a British passport](/overseas-passports) for the child first.^
+
+ To register the birth with the UK authorities you must:
+ <% end %>
+ <% else %>
+ You can also register the birth with the UK authorities. You must:
+ <% end %>
+
+ s1. Check that you have the right documents.
+ s2. Print out and fill in the birth registration form.
+ s3. Pay.
+ s4. Post your documents and the form.
+
+
+ %The service to register a birth with the UK authorities is currently suspended. This page will be updated when it has resumed.%
+
+ ##1. Check your documents
+
+ ^Send English translations of all foreign documents. <%= calculator.translator_link_url ? "Use an [approved translator](#{calculator.translator_link_url}) and include their name and address with your application" : 'Use a professional translator and include their name and address with your application' %>. Don't send laminated documents.^
+
+ <% if calculator.country_of_birth == 'morocco' && calculator.paternity_declaration? %>
+ ^Only the mother will be named on the local birth certificate if you are not married. To add the father’s name you must swear a paternity declaration in a Moroccan court and you may be ordered to get married.^
+ <% end %>
+
+ You must send the original versions of:
+
+ <% if calculator.oru_documents_variant_for_birth? %>
+ <% if calculator.country_of_birth == 'united-arab-emirates' && calculator.paternity_declaration? %>
+ - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs (email if the local authorities will not provide a birth certificate)
+ <% else %>
+ <% case calculator.country_of_birth %>
+ <% when 'oru_documents_variant_andorra' %>
+ - the child’s full local birth certificate (‘declaració de naixement’) - it must have both parents’ names
+ <% when 'belgium' %>
+ - the child’s full local birth certificate (‘copie d’acte’ or ‘afschrift van een akte’) - it must have both parents’ names
+ <% when 'denmark' %>
+ - the child's full local birth certificate ('fødsel og navneattest') - it must have both parents' names
+ - confirmation from the hospital or clinic where the child was born - for example a letter or live birth notification
+ <% when 'finland' %>
+ - a birth certificate issued by the hospital
+ - an extract in English from the Population Information System which has the name of the child and the parents, issued within the last 3 months - you can get this from the [register office](http://www.maistraatti.fi/en/About-Local-Register-Offices/)
+ <% when 'france' %>
+ - the child’s full local birth certificate (‘copie integrale acte de naissance’) - it must have both parents’ names
+ <% when 'india' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - the mother's antenatal records (eg blood test results, ultrasound scans and doctors' notes)
+ - the hospital live birth certificate
+ - the hospital discharge summary (a letter from the hospital saying what treatment you had)
+ <% when 'israel' %>
+ - the child's full local birth certificate
+ - the hospital live birth certificate (if the father is not named on the local birth certificate)
+ <% when 'italy' %>
+ - the child’s long international birth certificate (not the standard short version) - it must have both parents’ names
+ <% when 'japan' %>
+ - the child’s local birth certificate ('shussetodoke kisaijiko shomeisho') - it must have the name and address of the hospital
+ - a copy of the family register ('koseki tohon') which has been certified by the ward office (if one of the parents is Japanese)
+ - a [name confirmation form](/government/publications/birth-registration-name-confirmation-form) that says how you would like the child’s full name to be registered, if the name differs from the name on the local birth certificate or Japanese family register (the rules are on the form)
+ <% when 'monaco' %>
+ - the child’s full local birth certificate (‘copie integrale acte de naissance’) - it must have both parents’ names
+ <% when 'morocco' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - a [name confirmation form](https://www.gov.uk/government/publications/birth-registration-name-confirmation-form) that says how you would like the child's full name to be registered, if the name differs from the name on the local birth certificate
+ <% when 'nepal' %>
+ - the child’s full local birth certificate (if one parent is Nepali) - it must have both parents’ names
+ - the hospital live birth certificate
+ <% when 'netherlands' %>
+ - the Dutch version of the child’s full birth certificate (‘akte van geboorte’) and a translation of the certificate into English
+ <% when 'nigeria' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - the mother's antenatal records (eg blood test results, ultrasound scans and doctors' notes)
+ - the hospital live birth certificate
+ <% when 'poland' %>
+ - the child’s full local birth certificate (‘zupelny’) - it must have both parents’ names
+ <% when 'portugal' %>
+ - the child’s full local birth certificate (‘assento de nascimento’) - it must have both parents’ names
+ - the hospital declaration of live birth (if the hospital’s name is not on your child’s birth certificate)
+ <% when 'russia' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ <% when 'sierra-leone' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - the hospital live birth certificate
+ <% when 'south-korea' %>
+ - the child's birth certificate ('gi bon jung myung seo') and family relations certificate ('ga-jok-gwan-gye-jeung-myeong-seo') (if one or both parents are Korean nationals)
+ - the child's hospital birth certificate with both parents' names (if neither parent is a Korean national)
+ - a [name confirmation form](/government/publications/birth-registration-name-confirmation-form) that says how you would like the child’s full name to be registered, if the name differs from the name on the family relations certificate (the rules are on the form)
+ <% when 'spain' %>
+ - the child’s full local birth certificate (‘certificación literal’) - it must have both parents’ names
+ <% when 'sri-lanka' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - hospital live birth certificate
+ <% when 'sweden' %>
+ - a family certificate (‘familjebevis’) from the the Swedish Tax Agency (Skatteverket)
+ <% when 'united-arab-emirates' %>
+ - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs
+ <% when 'taiwan' %>
+ - both Chinese and English versions of the child’s birth certificate - you can send a translation if the hospital doesn't issue an English version
+ <% when 'the-occupied-palestinian-territories' %>
+ - the child's full local birth certificate
+ - the hospital declaration of live birth (if the father isn't named on the birth certificate)
+ <% when 'turkey' %>
+ - the child’s full local birth certificate - called the ‘Formül A’
+ - the hospital live birth report
+ <% when 'uae_not_married' %>
+ - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs (email if the local authorities will not provide a birth certificate)
+ <% when 'usa' %>
+ - the child’s full local birth certificate - it must have both parents’ names
+ - hospital, medical or insurance records naming the parents as the birth parents (if the birth was registered more than three months after it took place)
+ <% end %>
+ <% end %>
+ <% else %>
+ - the child’s full local birth certificate - it must have both parents' names
+ <% end %>
+
+ - the long version of the parent’s birth certificate showing the child’s grandparents’ details (for parents who were born in the UK)
+ - the parent’s naturalisation or registration certificate (for parents who were not born in the UK)
+ - the parents’ marriage or civil partnership certificate (if applicable)
+ - evidence that the parents’ previous marriages or civil partnerships have ended (eg divorce or death certificates)
+ - change of name documents (if either parent has ever changed their name)
+ - a letter from the parent’s employer if they’re working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
+ - written evidence if the parent was born overseas while one of their own parents was working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
+
+ You must also send photocopies of:
+
+ - the photo page of the child’s British passport if they have one
+ - the photo pages of both parents’ current passports regardless of nationality (if you do not have a passport, send a copy of another identity document that has a photo)
+
+ <% if calculator.country_of_birth.in?(%w(philippines sierra-leone uganda)) %>
+ If the child does not have a British passport you must also send the original copies of:
+
+ <% if calculator.country_of_birth == 'philippines' and calculator.british_national_parent.exclude?('mother') %>
+ - a Certificate of No Marriage ("Cenomar") issued by the National Statistics Office (NSO) or Philippine Statistics Authority (PSA) - if the Filipino mother is single
+ - an Advisory on Marriage certificate issued by the NSO or PSA - if the Filipino mother is married
+
+ <% end %>
+ <% case calculator.country_of_birth %>
+ <% when 'philippines' %>
+ - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
+ - health cards from the hospital, doctor or clinic
+ - immunisation and vaccination cards
+ - a letter from the hospital confirming the birth
+ - receipts from the hospital for the birth and any medical treatment (if any)
+ - photos of the child as a baby, in which the child can clearly be identified with its parents in the Philippines
+ - photos of the child growing up in the Philippines with its parents and any siblings
+ - the parents' wedding photos (if the parents have been married)
+ - photos of the mother during pregnancy (if the mother is a British citizen)
+ <% when 'sierra-leone' %>
+ - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
+ - health cards from the hospital, doctor or clinic
+ - immunisation and vaccination cards
+ - a letter from the hospital confirming the birth
+ - receipts from the hospital for the birth and any medical treatment (if any)
+ - photos of the child as a baby, in which the child can clearly be identified with its parents in Sierra Leone
+ - photos of the child growing up in Sierra Leone with its parents and any siblings
+ - the parents' wedding photos (if the parents have been married)
+ - photos of the mother during pregnancy (if the mother is a British citizen)
+ <% when 'uganda' %>
+ - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
+ - health cards from the hospital, doctor or clinic
+ - immunisation and vaccination cards
+ - a letter from the hospital confirming the birth
+ - receipts from the hospital for the birth and any medical treatment (if any)
+ - photos of the child as a baby, in which the child can clearly be identified with its parents in Uganda
+ - photos of the child growing up in Uganda with its parents and any siblings
+ - the parents' wedding photos (if the parents have been married)
+ - photos of the mother during pregnancy (if the mother is a British citizen)
+ <% end %>
+ <% end %>
+
+ %Your application will be rejected if the documents are not authentic, don’t confirm the child’s identity or do not prove that the child has a claim to British nationality. The registration fee will not be refunded.%
+
+
+ ##2. Fill in the application form
+
+ Print out and fill in the [application form](/government/publications/application-to-register-an-overseas-birth).
+
+
+ ##3. Pay
+
+ <% if !calculator.in_the_uk? && calculator.registration_country == 'algeria' %>
+ Pay by credit or debit card - fill in the [credit card authorisation slip](/government/publications/credit-card-authorisation-form-algeria) and post it with your registration form.
+ <% elsif calculator.country_of_birth == 'sudan' ||
+ calculator.current_country == 'sudan' %>
+ You can [pay for the registration online](https://pay-register-birth-abroad.service.gov.uk/start).
+
+ If you’re unable to pay for the registration online, you can also pay in person at the Consular section of the [British Embassy, Khartoum](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact).
+ <% else %>
+ You should pay online for the registration. Email if you’re unable to pay online.
+ <% end %>
+
+ The registration fee does not include any copies of the certificate, but you can order them at the same time. Cheaper copies will be available from the General Register Office or the National Records Office of Scotland, but only from November the year after you register.
+
+ Once you’ve paid you will be given a reference number to use on your birth registration form.
+
+ <%= render partial: 'fees',
+ locals: { calculator: calculator } %>
+
+ <%= render partial: 'shared/births_and_deaths_registration/document_return_fees', locals: { document_return_fees: calculator.document_return_fees } %>
+
+ <%= render partial: 'shared/births_and_deaths_registration/button', locals: { button_data: { text: "Pay now", url: "https://pay-register-birth-abroad.service.gov.uk/start" } } %>
+
+ ##4. Send your registration
+
+ Post the registration form and documents by secure post to:
+
+ <% if calculator.in_the_uk? %>
+
+ $A
+ Overseas Registration Unit
+ Foreign and Commonwealth Office
+ PO Box 6255
+ Milton Keynes
+ MK10 1XX
+ $A
+ <% else %>
+
+ $A
+ Overseas Registration Unit
+ Foreign & Commonwealth Office
+ Hanslope Park
+ Hanslope
+ Milton Keynes
+ MK19 7BH
+ United Kingdom
+ $A
+ <% end %>
+
+ ##Return of your documents
+
+ <% if calculator.may_require_dna_tests? %>
+ Once the Overseas Registration Unit gets your form and the right documents, registering the birth will usually take:
+
+ * at least <%= calculator.custom_waiting_time %> if the child doesn’t have a British passport
+
+ The Overseas Registration Unit will contact you if they need:
+
+ - more information
+ - to verify your documents
+ - the child or parents to take a DNA test
+
+ If this happens, it will take longer for the birth to be registered.
+
+ ^You must pay all costs relating to DNA testing.^
+ <% elsif calculator.custom_waiting_time %>
+ Once the Overseas Registration Unit gets your form and the right documents, registering the birth will usually take:
+
+ * at least <%= calculator.custom_waiting_time %> if the child doesn’t have a British passport
+
+ The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take longer for the birth to be registered.
+ <% elsif calculator.registration_country == 'north-korea' and calculator.born_in_lower_risk_country? %>
+ ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the birth will be registered.^
+ <% else %>
+ The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take up to 3 months for the birth to be registered.
+ <% end %>
+
+ <% if calculator.oru_courier_variant? && !calculator.in_the_uk? %>
+ <% case calculator.registration_country %>
+ <% when 'cambodia' %>
+ Your documents will be returned to the British Embassy in Phnom Penh after the birth has been registered.
+ <% when 'kenya' %>
+ Your documents will be returned to the British High Commission in Nairobi after the birth has been registered.
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
+ <% when 'cameroon' %>
+ Your documents will be returned to the British High Commission in Yaonde.
+
+ You'll also be sent copies of the registration certificate if you've paid for them. The High Commission will contact you when your documents are ready for collection.
+ <% when 'nigeria' %>
+ Your documents will be returned to the British High Commission in Lagos after the birth has been registered.
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
+ <% when 'north-korea' %>
+ Your documents will be returned to the British Embassy in Pyongyang after the birth has been registered.
+ <% when 'papua-new-guinea' %>
+ Your documents will be returned to the British Embassy in Port Moresby after the birth has been registered.
+ <% when 'uganda' %>
+ Your documents will be returned to the British High Commission in Kampala after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+ <% end %>
+ <% unless calculator.oru_courier_by_high_commission? %>
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+ <% end %>
+ <% else %>
+ Your documents will be returned to you by secure courier after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb
deleted file mode 100644
index 34b21489372..00000000000
--- a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb
+++ /dev/null
@@ -1,302 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the birth in the country where the child was born. You'll be given a local birth certificate.$!
-
- <% if calculator.registration_country == 'indonesia' and calculator.british_national_father? and calculator.paternity_declaration? %>
- %You’ll need to get a court order to have the father named on the birth certificate before registering if you’re unmarried and only the father has British nationality.%
- <% end %>
-
- <% if calculator.higher_risk_country? %>
- <% if calculator.registration_country == 'libya' %>
- You can also register the birth with the UK authorities.
-
- ^It’s usually quicker to register the birth with the UK authorities if you [get a British passport](/overseas-passports) for the child first. You cannot apply for a passport in Libya but you can apply in a neighbouring country.^
-
- To register the birth with the UK authorities you must:
- <% else %>
- You can also register the birth with the UK authorities.
-
- ^It’s usually quicker to register the birth with the UK authorities if you [get a British passport](/overseas-passports) for the child first.^
-
- To register the birth with the UK authorities you must:
- <% end %>
- <% else %>
- You can also register the birth with the UK authorities. You must:
- <% end %>
-
- s1. Check that you have the right documents.
- s2. Print out and fill in the birth registration form.
- s3. Pay.
- s4. Post your documents and the form.
-
-
- %The service to register a birth with the UK authorities is currently suspended. This page will be updated when it has resumed.%
-
- ##1. Check your documents
-
- ^Send English translations of all foreign documents. <%= calculator.translator_link_url ? "Use an [approved translator](#{calculator.translator_link_url}) and include their name and address with your application" : 'Use a professional translator and include their name and address with your application' %>. Don't send laminated documents.^
-
- <% if calculator.country_of_birth == 'morocco' && calculator.paternity_declaration? %>
- ^Only the mother will be named on the local birth certificate if you are not married. To add the father’s name you must swear a paternity declaration in a Moroccan court and you may be ordered to get married.^
- <% end %>
-
- You must send the original versions of:
-
- <% if calculator.oru_documents_variant_for_birth? %>
- <% if calculator.country_of_birth == 'united-arab-emirates' && calculator.paternity_declaration? %>
- - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs (email if the local authorities will not provide a birth certificate)
- <% else %>
- <% case calculator.country_of_birth %>
- <% when 'oru_documents_variant_andorra' %>
- - the child’s full local birth certificate (‘declaració de naixement’) - it must have both parents’ names
- <% when 'belgium' %>
- - the child’s full local birth certificate (‘copie d’acte’ or ‘afschrift van een akte’) - it must have both parents’ names
- <% when 'denmark' %>
- - the child's full local birth certificate ('fødsel og navneattest') - it must have both parents' names
- - confirmation from the hospital or clinic where the child was born - for example a letter or live birth notification
- <% when 'finland' %>
- - a birth certificate issued by the hospital
- - an extract in English from the Population Information System which has the name of the child and the parents, issued within the last 3 months - you can get this from the [register office](http://www.maistraatti.fi/en/About-Local-Register-Offices/)
- <% when 'france' %>
- - the child’s full local birth certificate (‘copie integrale acte de naissance’) - it must have both parents’ names
- <% when 'india' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - the mother's antenatal records (eg blood test results, ultrasound scans and doctors' notes)
- - the hospital live birth certificate
- - the hospital discharge summary (a letter from the hospital saying what treatment you had)
- <% when 'israel' %>
- - the child's full local birth certificate
- - the hospital live birth certificate (if the father is not named on the local birth certificate)
- <% when 'italy' %>
- - the child’s long international birth certificate (not the standard short version) - it must have both parents’ names
- <% when 'japan' %>
- - the child’s local birth certificate ('shussetodoke kisaijiko shomeisho') - it must have the name and address of the hospital
- - a copy of the family register ('koseki tohon') which has been certified by the ward office (if one of the parents is Japanese)
- - a [name confirmation form](/government/publications/birth-registration-name-confirmation-form) that says how you would like the child’s full name to be registered, if the name differs from the name on the local birth certificate or Japanese family register (the rules are on the form)
- <% when 'monaco' %>
- - the child’s full local birth certificate (‘copie integrale acte de naissance’) - it must have both parents’ names
- <% when 'morocco' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - a [name confirmation form](https://www.gov.uk/government/publications/birth-registration-name-confirmation-form) that says how you would like the child's full name to be registered, if the name differs from the name on the local birth certificate
- <% when 'nepal' %>
- - the child’s full local birth certificate (if one parent is Nepali) - it must have both parents’ names
- - the hospital live birth certificate
- <% when 'netherlands' %>
- - the Dutch version of the child’s full birth certificate (‘akte van geboorte’) and a translation of the certificate into English
- <% when 'nigeria' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - the mother's antenatal records (eg blood test results, ultrasound scans and doctors' notes)
- - the hospital live birth certificate
- <% when 'poland' %>
- - the child’s full local birth certificate (‘zupelny’) - it must have both parents’ names
- <% when 'portugal' %>
- - the child’s full local birth certificate (‘assento de nascimento’) - it must have both parents’ names
- - the hospital declaration of live birth (if the hospital’s name is not on your child’s birth certificate)
- <% when 'russia' %>
- - the child’s full local birth certificate - it must have both parents’ names
- <% when 'sierra-leone' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - the hospital live birth certificate
- <% when 'south-korea' %>
- - the child's birth certificate ('gi bon jung myung seo') and family relations certificate ('ga-jok-gwan-gye-jeung-myeong-seo') (if one or both parents are Korean nationals)
- - the child's hospital birth certificate with both parents' names (if neither parent is a Korean national)
- - a [name confirmation form](/government/publications/birth-registration-name-confirmation-form) that says how you would like the child’s full name to be registered, if the name differs from the name on the family relations certificate (the rules are on the form)
- <% when 'spain' %>
- - the child’s full local birth certificate (‘certificación literal’) - it must have both parents’ names
- <% when 'sri-lanka' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - hospital live birth certificate
- <% when 'sweden' %>
- - a family certificate (‘familjebevis’) from the the Swedish Tax Agency (Skatteverket)
- <% when 'united-arab-emirates' %>
- - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs
- <% when 'taiwan' %>
- - both Chinese and English versions of the child’s birth certificate - you can send a translation if the hospital doesn't issue an English version
- <% when 'the-occupied-palestinian-territories' %>
- - the child's full local birth certificate
- - the hospital declaration of live birth (if the father isn't named on the birth certificate)
- <% when 'turkey' %>
- - the child’s full local birth certificate - called the ‘Formül A’
- - the hospital live birth report
- <% when 'uae_not_married' %>
- - both English and Arabic versions of your child’s full local birth certificate, attested by the Ministry of Foreign Affairs (email if the local authorities will not provide a birth certificate)
- <% when 'usa' %>
- - the child’s full local birth certificate - it must have both parents’ names
- - hospital, medical or insurance records naming the parents as the birth parents (if the birth was registered more than three months after it took place)
- <% end %>
- <% end %>
- <% else %>
- - the child’s full local birth certificate - it must have both parents' names
- <% end %>
-
- - the long version of the parent’s birth certificate showing the child’s grandparents’ details (for parents who were born in the UK)
- - the parent’s naturalisation or registration certificate (for parents who were not born in the UK)
- - the parents’ marriage or civil partnership certificate (if applicable)
- - evidence that the parents’ previous marriages or civil partnerships have ended (eg divorce or death certificates)
- - change of name documents (if either parent has ever changed their name)
- - a letter from the parent’s employer if they’re working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
- - written evidence if the parent was born overseas while one of their own parents was working abroad as a UK civil servant, EU civil servant, diplomat or member of HM Forces (for British parents)
-
- You must also send photocopies of:
-
- - the photo page of the child’s British passport if they have one
- - the photo pages of both parents’ current passports regardless of nationality (if you do not have a passport, send a copy of another identity document that has a photo)
-
- <% if calculator.country_of_birth.in?(%w(philippines sierra-leone uganda)) %>
- If the child does not have a British passport you must also send the original copies of:
-
- <% if calculator.country_of_birth == 'philippines' and calculator.british_national_parent.exclude?('mother') %>
- - a Certificate of No Marriage ("Cenomar") issued by the National Statistics Office (NSO) or Philippine Statistics Authority (PSA) - if the Filipino mother is single
- - an Advisory on Marriage certificate issued by the NSO or PSA - if the Filipino mother is married
-
- <% end %>
- <% case calculator.country_of_birth %>
- <% when 'philippines' %>
- - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
- - health cards from the hospital, doctor or clinic
- - immunisation and vaccination cards
- - a letter from the hospital confirming the birth
- - receipts from the hospital for the birth and any medical treatment (if any)
- - photos of the child as a baby, in which the child can clearly be identified with its parents in the Philippines
- - photos of the child growing up in the Philippines with its parents and any siblings
- - the parents' wedding photos (if the parents have been married)
- - photos of the mother during pregnancy (if the mother is a British citizen)
- <% when 'sierra-leone' %>
- - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
- - health cards from the hospital, doctor or clinic
- - immunisation and vaccination cards
- - a letter from the hospital confirming the birth
- - receipts from the hospital for the birth and any medical treatment (if any)
- - photos of the child as a baby, in which the child can clearly be identified with its parents in Sierra Leone
- - photos of the child growing up in Sierra Leone with its parents and any siblings
- - the parents' wedding photos (if the parents have been married)
- - photos of the mother during pregnancy (if the mother is a British citizen)
- <% when 'uganda' %>
- - the mother’s antenatal, postnatal and delivery notes from the hospital (for example, blood test results, ultrasound scans and doctors' notes) or copies certified by the hospital if you cannot get the originals
- - health cards from the hospital, doctor or clinic
- - immunisation and vaccination cards
- - a letter from the hospital confirming the birth
- - receipts from the hospital for the birth and any medical treatment (if any)
- - photos of the child as a baby, in which the child can clearly be identified with its parents in Uganda
- - photos of the child growing up in Uganda with its parents and any siblings
- - the parents' wedding photos (if the parents have been married)
- - photos of the mother during pregnancy (if the mother is a British citizen)
- <% end %>
- <% end %>
-
- %Your application will be rejected if the documents are not authentic, don’t confirm the child’s identity or do not prove that the child has a claim to British nationality. The registration fee will not be refunded.%
-
-
- ##2. Fill in the application form
-
- Print out and fill in the [application form](/government/publications/application-to-register-an-overseas-birth).
-
-
- ##3. Pay
-
- <% if !calculator.in_the_uk? && calculator.registration_country == 'algeria' %>
- Pay by credit or debit card - fill in the [credit card authorisation slip](/government/publications/credit-card-authorisation-form-algeria) and post it with your registration form.
- <% elsif calculator.country_of_birth == 'sudan' ||
- calculator.current_country == 'sudan' %>
- You can [pay for the registration online](https://pay-register-birth-abroad.service.gov.uk/start).
-
- If you’re unable to pay for the registration online, you can also pay in person at the Consular section of the [British Embassy, Khartoum](/government/world/organisations/british-embassy-khartoum/office/british-embassy-khartoum-main-contact).
- <% else %>
- You should pay online for the registration. Email if you’re unable to pay online.
- <% end %>
-
- The registration fee does not include any copies of the certificate, but you can order them at the same time. Cheaper copies will be available from the General Register Office or the National Records Office of Scotland, but only from November the year after you register.
-
- Once you’ve paid you will be given a reference number to use on your birth registration form.
-
- <%= render partial: 'fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
- <%= render partial: 'shared/births_and_deaths_registration/document_return_fees.govspeak.erb', locals: { document_return_fees: calculator.document_return_fees } %>
-
- <%= render partial: 'shared/births_and_deaths_registration/button.govspeak.erb', locals: { button_data: { text: "Pay now", url: "https://pay-register-birth-abroad.service.gov.uk/start" } } %>
-
- ##4. Send your registration
-
- Post the registration form and documents by secure post to:
-
- <% if calculator.in_the_uk? %>
-
- $A
- Overseas Registration Unit
- Foreign and Commonwealth Office
- PO Box 6255
- Milton Keynes
- MK10 1XX
- $A
- <% else %>
-
- $A
- Overseas Registration Unit
- Foreign & Commonwealth Office
- Hanslope Park
- Hanslope
- Milton Keynes
- MK19 7BH
- United Kingdom
- $A
- <% end %>
-
- ##Return of your documents
-
- <% if calculator.may_require_dna_tests? %>
- Once the Overseas Registration Unit gets your form and the right documents, registering the birth will usually take:
-
- * at least <%= calculator.custom_waiting_time %> if the child doesn’t have a British passport
-
- The Overseas Registration Unit will contact you if they need:
-
- - more information
- - to verify your documents
- - the child or parents to take a DNA test
-
- If this happens, it will take longer for the birth to be registered.
-
- ^You must pay all costs relating to DNA testing.^
- <% elsif calculator.custom_waiting_time %>
- Once the Overseas Registration Unit gets your form and the right documents, registering the birth will usually take:
-
- * at least <%= calculator.custom_waiting_time %> if the child doesn’t have a British passport
-
- The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take longer for the birth to be registered.
- <% elsif calculator.registration_country == 'north-korea' and calculator.born_in_lower_risk_country? %>
- ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the birth will be registered.^
- <% else %>
- The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take up to 3 months for the birth to be registered.
- <% end %>
-
- <% if calculator.oru_courier_variant? && !calculator.in_the_uk? %>
- <% case calculator.registration_country %>
- <% when 'cambodia' %>
- Your documents will be returned to the British Embassy in Phnom Penh after the birth has been registered.
- <% when 'kenya' %>
- Your documents will be returned to the British High Commission in Nairobi after the birth has been registered.
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
- <% when 'cameroon' %>
- Your documents will be returned to the British High Commission in Yaonde.
-
- You'll also be sent copies of the registration certificate if you've paid for them. The High Commission will contact you when your documents are ready for collection.
- <% when 'nigeria' %>
- Your documents will be returned to the British High Commission in Lagos after the birth has been registered.
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
- <% when 'north-korea' %>
- Your documents will be returned to the British Embassy in Pyongyang after the birth has been registered.
- <% when 'papua-new-guinea' %>
- Your documents will be returned to the British Embassy in Port Moresby after the birth has been registered.
- <% when 'uganda' %>
- Your documents will be returned to the British High Commission in Kampala after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
- <% end %>
- <% unless calculator.oru_courier_by_high_commission? %>
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
- <% end %>
- <% else %>
- Your documents will be returned to you by secure courier after the birth has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them.
- <% end %>
-<% 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
new file mode 100644
index 00000000000..3802525a822
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ What is your child’s date of birth?
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.govspeak.erb
deleted file mode 100644
index 4b5be907582..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..e60f3977e31
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Which country was the child born in?
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.govspeak.erb
deleted file mode 100644
index 00421a28f4b..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..1f8d29deb60
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Have you adopted the child?
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.govspeak.erb
deleted file mode 100644
index 63237b72a88..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..e4ccc4e6131
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Were you married to the other parent when your child was born?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.govspeak.erb
deleted file mode 100644
index 73e4d0051d9..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Were you married to the other parent when your child was born?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..e844ffe924c
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where are you now?
+<% end %>
+
+<% options(
+ "same_country": "In the country where the child was born",
+ "another_country": "In another country",
+ "in_the_uk": "In the UK"
+) %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.govspeak.erb
deleted file mode 100644
index 9b30bf449bf..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where are you now?
-<% end %>
-
-<% options(
- "same_country": "In the country where the child was born",
- "another_country": "In another country",
- "in_the_uk": "In the UK"
-) %>
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
new file mode 100644
index 00000000000..18119a109e9
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/which_country.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Which country?
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/which_country.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/which_country.govspeak.erb
deleted file mode 100644
index f3979de914b..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/which_country.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..7036594727f
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Who has British nationality?
+<% end %>
+
+<% options(
+ "mother": "Mother only",
+ "father": "Father only",
+ "mother_and_father": "Mother and father",
+ "neither": "Neither"
+) %>
+
+<% govspeak_for :body do %>
+ If the British parent was born abroad, they may be a British citizen ‘by descent’. This means they may not be allowed to pass on their British nationality to a child also born abroad. [Check if the parent is a British citizen by descent](/check-british-citizen).
+
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.govspeak.erb b/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.govspeak.erb
deleted file mode 100644
index 35a726b7f0c..00000000000
--- a/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Who has British nationality?
-<% end %>
-
-<% options(
- "mother": "Mother only",
- "father": "Father only",
- "mother_and_father": "Mother and father",
- "neither": "Neither"
-) %>
-
-<% render_content_for :body do %>
- If the British parent was born abroad, they may be a British citizen ‘by descent’. This means they may not be allowed to pass on their British nationality to a child also born abroad. [Check if the parent is a British citizen by descent](/check-british-citizen).
-
-<% 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
new file mode 100644
index 00000000000..90ddfe8eecf
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-birth/register_a_birth.erb
@@ -0,0 +1,26 @@
+<% text_for :title do %>
+ Register a birth abroad
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ $!You must register your child’s birth according to the regulations in the country where the child was born. They’ll give you a local birth certificate.$!
+
+ This local birth certificate should be accepted in the UK, for example when you apply for a passport or register with a school or doctor. You might need to have it [translated and certified](https://www.gov.uk/certifying-a-document) if it is not in English.
+
+ Once you’ve registered locally you may also be able to register the birth with the UK authorities. You can only do this if the child was born on or after 1 January 1983.
+
+ You do not need to register with the UK authorities but it means:
+
+ - the birth will be recorded with the General Register Offices or at the National Records Office of Scotland
+ - you can order a consular birth registration certificate
+
+ You can still [apply for a UK passport for your child](/apply-renew-passport) even if you do not register the birth in the UK.
+
+^If you’re a member of HM Armed Forces or you work with them, you may be able to register a birth abroad. Email to check if you’re eligible.^
+
+ %The service to register a birth with the UK authorities is currently suspended. This page will be updated when it has resumed.%
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/register_a_birth.govspeak.erb b/lib/smart_answer_flows/register-a-birth/register_a_birth.govspeak.erb
deleted file mode 100644
index 82eab9ff1d2..00000000000
--- a/lib/smart_answer_flows/register-a-birth/register_a_birth.govspeak.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% render_content_for :title do %>
- Register a birth abroad
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- $!You must register your child’s birth according to the regulations in the country where the child was born. They’ll give you a local birth certificate.$!
-
- This local birth certificate should be accepted in the UK, for example when you apply for a passport or register with a school or doctor. You might need to have it [translated and certified](https://www.gov.uk/certifying-a-document) if it is not in English.
-
- Once you’ve registered locally you may also be able to register the birth with the UK authorities. You can only do this if the child was born on or after 1 January 1983.
-
- You do not need to register with the UK authorities but it means:
-
- - the birth will be recorded with the General Register Offices or at the National Records Office of Scotland
- - you can order a consular birth registration certificate
-
- You can still [apply for a UK passport for your child](/apply-renew-passport) even if you do not register the birth in the UK.
-
-^If you’re a member of HM Armed Forces or you work with them, you may be able to register a birth abroad. Email to check if you’re eligible.^
-
- %The service to register a birth with the UK authorities is currently suspended. This page will be updated when it has resumed.%
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/_fees.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/_fees.erb
similarity index 100%
rename from lib/smart_answer_flows/register-a-death/outcomes/_fees.govspeak.erb
rename to lib/smart_answer_flows/register-a-death/outcomes/_fees.erb
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.erb
similarity index 100%
rename from lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.govspeak.erb
rename to lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.erb
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.erb
new file mode 100644
index 00000000000..b4d63c0256d
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
+
+ You can't register the death with the UK authorities. The death certificate you are given in <%= calculator.death_country_name_lowercase_prefix %> will be accepted and recognised in the UK.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.govspeak.erb
deleted file mode 100644
index fa524cffff6..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
-
- You can't register the death with the UK authorities. The death certificate you are given in <%= calculator.death_country_name_lowercase_prefix %> will be accepted and recognised in the UK.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.erb
new file mode 100644
index 00000000000..93e44671b20
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
+
+ You can’t currently register the death with the UK authorities.
+
+ The local death certificate, with a [certified translation](/certifying-a-document), should be acceptable for all purposes in the UK. You can apply for registration at any time in the future - check [travel advice](/foreign-travel-advice) to find out if consular services have reopened in <%= calculator.death_country_name_lowercase_prefix %>.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.govspeak.erb
deleted file mode 100644
index 0f90f6b2716..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
-
- You can’t currently register the death with the UK authorities.
-
- The local death certificate, with a [certified translation](/certifying-a-document), should be acceptable for all purposes in the UK. You can apply for registration at any time in the future - check [travel advice](/foreign-travel-advice) to find out if consular services have reopened in <%= calculator.death_country_name_lowercase_prefix %>.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.erb
new file mode 100644
index 00000000000..aa37fcc2613
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.erb
@@ -0,0 +1,52 @@
+<% govspeak_for :body do %>
+ $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
+
+ This local death certificate will be accepted in the UK (it may need to be a [certified translation](/certifying-a-document) of the document if it’s not in English).
+
+ ##Register the death with the UK authorities
+
+ You can also apply to register the death with the British embassy in <%= calculator.registration_country_name_lowercase_prefix %>.
+
+ You don’t have to do this, but it means:
+
+ - a British-style death certificate will be issued
+ - having the death registered at the General Register Office in the UK
+
+ ##How to register
+
+ Download and complete a [registration form](/government/publications/application-to-register-an-overseas-death).
+
+ ##Documents
+
+ You must provide originals and a photocopy of:
+
+ - a death certificate issued by Pyongyang Friendship Hospital
+ - a photocopy of the photo page of the passport of the person who died
+ - their original full UK birth, naturalisation or registration certificate (if you can’t provide their passport)
+ - written permission from the person’s next of kin or the executor of their estate (if you’re not next of kin or the executor)
+
+ Fill in [form D1, 'Returning the passport of a deceased person'](/government/publications/returning-the-passport-of-a-deceased-person) if you provide their passport.
+
+ Fill in [form LS01, 'Lost or Stolen Passport Notification'](/government/publications/lost-or-stolen-passport-notification--2) if the passport is lost or unavailable.
+
+ ##Cost
+
+ <%= render partial: 'fees',
+ locals: { calculator: calculator } %>
+
+ You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees](/government/organisations/foreign-commonwealth-office/series/consular-fees).
+
+ You can order copies of the registration certificate from the British embassy when you register the death.
+
+ You can also get copies from the [General Register Office](http://www.gro.gov.uk/) from November the year after you register - they will cost less.
+
+ ##Go to the British embassy
+
+ You can book an appointment at the British embassy and bring along the registration form, supporting documents and the fee.
+
+ ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the death will be registered.^
+
+ Your documents will be returned to the British Embassy in Pyongyang after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+
+ <%= render partial: 'shared/overseas_passports_embassies', locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb
deleted file mode 100644
index 6ba98409662..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the death according to the regulations in <%= calculator.death_country_name_lowercase_prefix %>. You will be given a local death certificate.$!
-
- This local death certificate will be accepted in the UK (it may need to be a [certified translation](/certifying-a-document) of the document if it’s not in English).
-
- ##Register the death with the UK authorities
-
- You can also apply to register the death with the British embassy in <%= calculator.registration_country_name_lowercase_prefix %>.
-
- You don’t have to do this, but it means:
-
- - a British-style death certificate will be issued
- - having the death registered at the General Register Office in the UK
-
- ##How to register
-
- Download and complete a [registration form](/government/publications/application-to-register-an-overseas-death).
-
- ##Documents
-
- You must provide originals and a photocopy of:
-
- - a death certificate issued by Pyongyang Friendship Hospital
- - a photocopy of the photo page of the passport of the person who died
- - their original full UK birth, naturalisation or registration certificate (if you can’t provide their passport)
- - written permission from the person’s next of kin or the executor of their estate (if you’re not next of kin or the executor)
-
- Fill in [form D1, 'Returning the passport of a deceased person'](/government/publications/returning-the-passport-of-a-deceased-person) if you provide their passport.
-
- Fill in [form LS01, 'Lost or Stolen Passport Notification'](/government/publications/lost-or-stolen-passport-notification--2) if the passport is lost or unavailable.
-
- ##Cost
-
- <%= render partial: 'fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
- You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees](/government/organisations/foreign-commonwealth-office/series/consular-fees).
-
- You can order copies of the registration certificate from the British embassy when you register the death.
-
- You can also get copies from the [General Register Office](http://www.gro.gov.uk/) from November the year after you register - they will cost less.
-
- ##Go to the British embassy
-
- You can book an appointment at the British embassy and bring along the registration form, supporting documents and the fee.
-
- ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the death will be registered.^
-
- Your documents will be returned to the British Embassy in Pyongyang after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
-
- <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: calculator.overseas_passports_embassies } %>
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.erb
new file mode 100644
index 00000000000..c4a765cf2b8
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ [Register the death](https://www.nidirect.gov.uk/articles/registering-death) with your nearest District Registration Office.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.govspeak.erb
deleted file mode 100644
index 8d4ae814165..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/northern_ireland_result.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- [Register the death](https://www.nidirect.gov.uk/articles/registering-death) with your nearest District Registration Office.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/oru_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/oru_result.erb
new file mode 100644
index 00000000000..e1635b8e457
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/oru_result.erb
@@ -0,0 +1,127 @@
+<% govspeak_for :body do %>
+ $!You must register the death according to the regulations in the country where the person died. You will be given a local death certificate.$!
+
+ This local death certificate will be accepted in the UK. It may need to be a [certified translation](/certifying-a-document) of the document if it’s not in English.
+
+ ##Register the death with the UK authorities
+
+ You can also apply to register the death with the UK authorities. You do not have to do this, but it means:
+
+ - the death will be recorded with the General Register Offices (for England, Wales and Northern Ireland) and the National Records Office of Scotland
+ - you can order a consular death registration certificate
+
+ You will need to:
+
+ s1. Check that you have the right documents.
+ s2. Print out and fill in the forms.
+ s3. Pay.
+ s4. Post your documents and the forms.
+
+
+ %The service to register a death with the UK authorities is currently suspended. This page will be updated when it has resumed.%
+
+ ###1. Documents
+
+ ^Send English translations of all foreign documents. <% if calculator.translator_link_url %>Use an [approved translator](<%= calculator.translator_link_url %>) and include their name and address with your application<% else %>Use a professional translator and include their name and address with your application<% end %>. Do not send laminated documents.^
+
+ You must provide:
+
+ <% if calculator.oru_documents_variant_for_death? %>
+ <% if calculator.country_of_death == 'poland' %>
+ - the full local death certificate ('zupelny')
+ <% elsif calculator.country_of_death == 'papua-new-guinea' %>
+ - the hospital medical death record
+ <% end %>
+ <% else %>
+ - the original local death certificate (not a certificate issued by a doctor)
+ <% end %>
+
+ - a photocopy of the photo page of the passport of the person who died
+ - their original full UK birth, naturalisation or registration certificate (if you cannot provide their passport)
+ - written permission from the person’s next of kin or the executor of their estate (if you’re not next of kin or the executor)
+
+ %Your application will be rejected if the documents are not authentic, do not confirm the person’s identity or do not prove that they were a British national when they died. The registration fee will not be refunded.%
+
+ ###2. Forms
+
+ Print out and fill in the [death registration form](/government/publications/application-to-register-an-overseas-death).
+
+ ###3. Pay
+
+ <% if !calculator.in_the_uk? && calculator.registration_country == 'algeria' %>
+ Pay by credit or debit card - fill in the [credit card authorisation slip](/government/publications/credit-card-authorisation-form-algeria) and post it with your registration form.
+ <% else %>
+ Pay online for the registration. Email if you are unable to pay online.
+ <% end %>
+
+ The registration fee does not include any copies of the certificate, but you can order them at the same time. Cheaper copies will be available from the General Register Office in the UK, but only from November the year after you register.
+
+ <%= render partial: 'fees',
+ locals: { calculator: calculator } %>
+
+ <%= render partial: 'shared/births_and_deaths_registration/document_return_fees', locals: { document_return_fees: calculator.document_return_fees } %>
+ <%= render partial: 'shared/births_and_deaths_registration/button', locals: { button_data: { text: "Pay now", url: "https://pay-register-death-abroad.service.gov.uk/start" } } %>
+
+
+ ###4. Send your registration
+
+ Once you've paid you will be given a reference number to use on your death registration form.
+
+ Post your registration form and documents by secure post to:
+
+
+ <% if calculator.in_the_uk? %>
+ $A
+ Overseas Registration Unit
+ Foreign and Commonwealth Office
+ PO Box 6255
+ Milton Keynes
+ MK10 1XX
+ $A
+ <% else %>
+ $A
+ Overseas Registration Unit
+ Foreign & Commonwealth Office
+ Hanslope Park
+ Hanslope
+ Milton Keynes
+ MK19 7BH
+ United Kingdom
+ $A
+ <% end %>
+
+ ##Return of your documents
+
+ The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take up to 3 months for the death to be registered.
+
+ <% if calculator.oru_courier_variant? %>
+ <% case calculator.registration_country %>
+ <% when 'cambodia' %>
+ Your documents will be returned to the British Embassy in Phnom Penh after the death has been registered.
+ <% when 'cameroon' %>
+ Your documents will be returned to the British High Commission in Yaonde.
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents are ready for collection.
+ <% when 'kenya' %>
+ Your documents will be returned to the British High Commission in Nairobi after the death has been registered.
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
+ <% when 'nigeria' %>
+ Your documents will be returned to the British High Commission in Lagos after the death has been registered.
+
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
+ <% when 'north-korea' %>
+ Your documents will be returned to the British Embassy in Pyongyang after the death has been registered.
+ <% when 'papua-new-guinea' %>
+ Your documents will be returned to the British Embassy in Port Moresby after the death has been registered.
+ <% when 'uganda' %>
+ Your documents will be returned to the British High Commission in Kampala after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+ <% end %>
+
+ <% unless calculator.oru_courier_by_high_commission? %>
+ You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
+ <% end %>
+ <% else %>
+ Your documents will be returned to you by secure courier after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them.
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb
deleted file mode 100644
index 9f2a5b4f115..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb
+++ /dev/null
@@ -1,127 +0,0 @@
-<% render_content_for :body do %>
- $!You must register the death according to the regulations in the country where the person died. You will be given a local death certificate.$!
-
- This local death certificate will be accepted in the UK. It may need to be a [certified translation](/certifying-a-document) of the document if it’s not in English.
-
- ##Register the death with the UK authorities
-
- You can also apply to register the death with the UK authorities. You do not have to do this, but it means:
-
- - the death will be recorded with the General Register Offices (for England, Wales and Northern Ireland) and the National Records Office of Scotland
- - you can order a consular death registration certificate
-
- You will need to:
-
- s1. Check that you have the right documents.
- s2. Print out and fill in the forms.
- s3. Pay.
- s4. Post your documents and the forms.
-
-
- %The service to register a death with the UK authorities is currently suspended. This page will be updated when it has resumed.%
-
- ###1. Documents
-
- ^Send English translations of all foreign documents. <% if calculator.translator_link_url %>Use an [approved translator](<%= calculator.translator_link_url %>) and include their name and address with your application<% else %>Use a professional translator and include their name and address with your application<% end %>. Do not send laminated documents.^
-
- You must provide:
-
- <% if calculator.oru_documents_variant_for_death? %>
- <% if calculator.country_of_death == 'poland' %>
- - the full local death certificate ('zupelny')
- <% elsif calculator.country_of_death == 'papua-new-guinea' %>
- - the hospital medical death record
- <% end %>
- <% else %>
- - the original local death certificate (not a certificate issued by a doctor)
- <% end %>
-
- - a photocopy of the photo page of the passport of the person who died
- - their original full UK birth, naturalisation or registration certificate (if you cannot provide their passport)
- - written permission from the person’s next of kin or the executor of their estate (if you’re not next of kin or the executor)
-
- %Your application will be rejected if the documents are not authentic, do not confirm the person’s identity or do not prove that they were a British national when they died. The registration fee will not be refunded.%
-
- ###2. Forms
-
- Print out and fill in the [death registration form](/government/publications/application-to-register-an-overseas-death).
-
- ###3. Pay
-
- <% if !calculator.in_the_uk? && calculator.registration_country == 'algeria' %>
- Pay by credit or debit card - fill in the [credit card authorisation slip](/government/publications/credit-card-authorisation-form-algeria) and post it with your registration form.
- <% else %>
- Pay online for the registration. Email if you are unable to pay online.
- <% end %>
-
- The registration fee does not include any copies of the certificate, but you can order them at the same time. Cheaper copies will be available from the General Register Office in the UK, but only from November the year after you register.
-
- <%= render partial: 'fees.govspeak.erb',
- locals: { calculator: calculator } %>
-
- <%= render partial: 'shared/births_and_deaths_registration/document_return_fees.govspeak.erb', locals: { document_return_fees: calculator.document_return_fees } %>
- <%= render partial: 'shared/births_and_deaths_registration/button.govspeak.erb', locals: { button_data: { text: "Pay now", url: "https://pay-register-death-abroad.service.gov.uk/start" } } %>
-
-
- ###4. Send your registration
-
- Once you've paid you will be given a reference number to use on your death registration form.
-
- Post your registration form and documents by secure post to:
-
-
- <% if calculator.in_the_uk? %>
- $A
- Overseas Registration Unit
- Foreign and Commonwealth Office
- PO Box 6255
- Milton Keynes
- MK10 1XX
- $A
- <% else %>
- $A
- Overseas Registration Unit
- Foreign & Commonwealth Office
- Hanslope Park
- Hanslope
- Milton Keynes
- MK19 7BH
- United Kingdom
- $A
- <% end %>
-
- ##Return of your documents
-
- The Overseas Registration Unit will contact you if they need more information or if they need to verify your documents. If this happens then it could take up to 3 months for the death to be registered.
-
- <% if calculator.oru_courier_variant? %>
- <% case calculator.registration_country %>
- <% when 'cambodia' %>
- Your documents will be returned to the British Embassy in Phnom Penh after the death has been registered.
- <% when 'cameroon' %>
- Your documents will be returned to the British High Commission in Yaonde.
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents are ready for collection.
- <% when 'kenya' %>
- Your documents will be returned to the British High Commission in Nairobi after the death has been registered.
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
- <% when 'nigeria' %>
- Your documents will be returned to the British High Commission in Lagos after the death has been registered.
-
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The High Commission will contact you when your documents and certificates are ready for collection.
- <% when 'north-korea' %>
- Your documents will be returned to the British Embassy in Pyongyang after the death has been registered.
- <% when 'papua-new-guinea' %>
- Your documents will be returned to the British Embassy in Port Moresby after the death has been registered.
- <% when 'uganda' %>
- Your documents will be returned to the British High Commission in Kampala after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
- <% end %>
-
- <% unless calculator.oru_courier_by_high_commission? %>
- You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection.
- <% end %>
- <% else %>
- Your documents will be returned to you by secure courier after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them.
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.erb
new file mode 100644
index 00000000000..adb51ced847
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ [Register the death](https://www.nrscotland.gov.uk/registration/registering-a-death) with the Registrar of Births, Deaths and Marriages.
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.govspeak.erb
deleted file mode 100644
index 9b3d54e4c8c..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/scotland_result.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- [Register the death](https://www.nrscotland.gov.uk/registration/registering-a-death) with the Registrar of Births, Deaths and Marriages.
-<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/uk_result.erb b/lib/smart_answer_flows/register-a-death/outcomes/uk_result.erb
new file mode 100644
index 00000000000..dfa9b6c4f0c
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/outcomes/uk_result.erb
@@ -0,0 +1,98 @@
+<% govspeak_for :body do %>
+ You should register the death within 5 days.
+
+ Contact a [register office](/register-offices) to register the death. You can contact any register office but it will be quicker if you use the one in the area where the person died.
+
+ Who should register the death
+ --------
+
+ A relative should register the death.
+
+ If a relative cannot register the death, you can do it if you:
+
+
+ <% if calculator.died_at_home_or_in_hospital? %>
+ - were there at the time of death
+ - are an administrator from the hospital (if the person died in hospital)
+ - are in charge of making funeral arrangements
+
+ <% else %>
+ - were there at the time of death
+ - are the person who found the body
+ - are the person in charge of the body
+ - are in charge of making funeral arrangements
+ <% end %>
+
+ <% if calculator.death_expected? %>
+ What you need to do
+ --------
+
+ The register office will tell you what you need to do when you contact them.
+
+ The register office may also want to see the person’s:
+
+ - birth certificate
+ - Council Tax bill
+ - driving licence
+ - marriage or civil partnership certificate
+ - NHS medical card
+ - passport
+ - proof of address (eg utility bill)
+
+ Ask the register office what to do if you do not have them.
+ <% else %>
+ What you need to do
+ --------
+
+ The register office will tell you what you need to do when you contact them.
+
+ If the cause of death is unknown, sudden or unexplained it may be reported to the coroner.
+
+ The coroner will give you the documents you need, or they’ll send them direct to the registrar. The table below shows the documents needed.
+
+ Cause of death | Documents issued by coroner
+ - | -
+ Natural causes | Form 100A, or Pink Form 100B if there's a post-mortem - these forms are sent to the registrar, but sometimes given to you
+ Unnatural causes/not enough evidence of natural causes | Order for Burial (form 101) or Certificate for Cremation (form 6) so the funeral can take place – will be given to you; Certificate After Inquest (form 99 (rev)) - this states the cause of death and is sent to the registrar (the death is registered by the registrar with no-one present)
+
+ ###If form 100A or 100B is issued (ie there is no inquest)
+
+ The register office may also want to see the person’s:
+
+ - birth certificate
+ - marriage or civil partnership certificate
+ - NHS medical card
+
+ Ask the register office what to do if you do not have them.
+ <% end %>
+
+ You’ll need to tell the registrar:
+
+ - the person’s full name at the time of death
+ - any names previously used, eg maiden name
+ - the person’s date and place of birth
+ - their last address
+ - their occupation
+ - the full name, date of birth and occupation of a surviving or late spouse or civil partner
+ - whether they were getting a State Pension or any other benefits
+
+
+ <% if calculator.death_expected? %>
+ Documents you’ll get
+ --------
+
+ When you register a death you’ll get:
+
+ - a Certificate for Burial or Cremation (the ‘green form’) - gives permission for burial or an application for cremation
+ - a Certificate of Registration of Death (form BD8) - you may need to fill this in and return it if the person was getting a State Pension or benefits (the form will come with a pre-paid envelope so you know where to send it)
+
+ You can buy extra death certificates - these will be needed for [sorting out the person’s affairs](/when-someone-dies).
+ <% else %>
+ Documents you’ll get
+ --------
+
+ When you register a death you’ll get a Certificate of Registration of Death (form BD8). You may need to fill this in and return it if the person was getting a State Pension or benefits (the form will come with a pre-paid envelope so you know where to send it).
+
+ You can buy extra death certificates - these will be needed for [sorting out the person’s affairs](/when-someone-dies).
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/outcomes/uk_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/uk_result.govspeak.erb
deleted file mode 100644
index 8f7bf7ac762..00000000000
--- a/lib/smart_answer_flows/register-a-death/outcomes/uk_result.govspeak.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-<% render_content_for :body do %>
- You should register the death within 5 days.
-
- Contact a [register office](/register-offices) to register the death. You can contact any register office but it will be quicker if you use the one in the area where the person died.
-
- Who should register the death
- --------
-
- A relative should register the death.
-
- If a relative cannot register the death, you can do it if you:
-
-
- <% if calculator.died_at_home_or_in_hospital? %>
- - were there at the time of death
- - are an administrator from the hospital (if the person died in hospital)
- - are in charge of making funeral arrangements
-
- <% else %>
- - were there at the time of death
- - are the person who found the body
- - are the person in charge of the body
- - are in charge of making funeral arrangements
- <% end %>
-
- <% if calculator.death_expected? %>
- What you need to do
- --------
-
- The register office will tell you what you need to do when you contact them.
-
- The register office may also want to see the person’s:
-
- - birth certificate
- - Council Tax bill
- - driving licence
- - marriage or civil partnership certificate
- - NHS medical card
- - passport
- - proof of address (eg utility bill)
-
- Ask the register office what to do if you do not have them.
- <% else %>
- What you need to do
- --------
-
- The register office will tell you what you need to do when you contact them.
-
- If the cause of death is unknown, sudden or unexplained it may be reported to the coroner.
-
- The coroner will give you the documents you need, or they’ll send them direct to the registrar. The table below shows the documents needed.
-
- Cause of death | Documents issued by coroner
- - | -
- Natural causes | Form 100A, or Pink Form 100B if there's a post-mortem - these forms are sent to the registrar, but sometimes given to you
- Unnatural causes/not enough evidence of natural causes | Order for Burial (form 101) or Certificate for Cremation (form 6) so the funeral can take place – will be given to you; Certificate After Inquest (form 99 (rev)) - this states the cause of death and is sent to the registrar (the death is registered by the registrar with no-one present)
-
- ###If form 100A or 100B is issued (ie there is no inquest)
-
- The register office may also want to see the person’s:
-
- - birth certificate
- - marriage or civil partnership certificate
- - NHS medical card
-
- Ask the register office what to do if you do not have them.
- <% end %>
-
- You’ll need to tell the registrar:
-
- - the person’s full name at the time of death
- - any names previously used, eg maiden name
- - the person’s date and place of birth
- - their last address
- - their occupation
- - the full name, date of birth and occupation of a surviving or late spouse or civil partner
- - whether they were getting a State Pension or any other benefits
-
-
- <% if calculator.death_expected? %>
- Documents you’ll get
- --------
-
- When you register a death you’ll get:
-
- - a Certificate for Burial or Cremation (the ‘green form’) - gives permission for burial or an application for cremation
- - a Certificate of Registration of Death (form BD8) - you may need to fill this in and return it if the person was getting a State Pension or benefits (the form will come with a pre-paid envelope so you know where to send it)
-
- You can buy extra death certificates - these will be needed for [sorting out the person’s affairs](/when-someone-dies).
- <% else %>
- Documents you’ll get
- --------
-
- When you register a death you’ll get a Certificate of Registration of Death (form BD8). You may need to fill this in and return it if the person was getting a State Pension or benefits (the form will come with a pre-paid envelope so you know where to send it).
-
- You can buy extra death certificates - these will be needed for [sorting out the person’s affairs](/when-someone-dies).
- <% end %>
-<% 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
new file mode 100644
index 00000000000..3f4dd0b8f51
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did the person die at home, in hospital or elsewhere?
+<% end %>
+
+<% options(
+ "at_home_hospital": "At home or in hospital",
+ "elsewhere": "Elsewhere"
+) %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.govspeak.erb
deleted file mode 100644
index 217738a18d9..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did the person die at home, in hospital or elsewhere?
-<% end %>
-
-<% options(
- "at_home_hospital": "At home or in hospital",
- "elsewhere": "Elsewhere"
-) %>
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
new file mode 100644
index 00000000000..354bf069429
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/was_death_expected.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was the death expected?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/was_death_expected.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/was_death_expected.govspeak.erb
deleted file mode 100644
index 7de44a47b4e..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/was_death_expected.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was the death expected?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..e9b10f8b5eb
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where are you now?
+<% end %>
+
+<% options(
+ "same_country": "In the country where the death happened",
+ "another_country": "In another country",
+ "in_the_uk": "In the UK"
+) %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.govspeak.erb
deleted file mode 100644
index 6711b439f41..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where are you now?
-<% end %>
-
-<% options(
- "same_country": "In the country where the death happened",
- "another_country": "In another country",
- "in_the_uk": "In the UK"
-) %>
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
new file mode 100644
index 00000000000..5a69e26db04
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Where did the death happen?
+<% end %>
+
+<% options(
+ "england_wales": "England or Wales",
+ "scotland": "Scotland",
+ "northern_ireland": "Northern Ireland",
+ "overseas": "Abroad"
+) %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.govspeak.erb
deleted file mode 100644
index 8904f8b778e..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Where did the death happen?
-<% end %>
-
-<% options(
- "england_wales": "England or Wales",
- "scotland": "Scotland",
- "northern_ireland": "Northern Ireland",
- "overseas": "Abroad"
-) %>
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
new file mode 100644
index 00000000000..757db9bd713
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/which_country.erb
@@ -0,0 +1,3 @@
+<% 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.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/which_country.govspeak.erb
deleted file mode 100644
index a8965337a77..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/which_country.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..6fea9fd0b40
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ Which country are you in now?
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.govspeak.erb b/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.govspeak.erb
deleted file mode 100644
index 2995d6df6ab..00000000000
--- a/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..5d38afc0d02
--- /dev/null
+++ b/lib/smart_answer_flows/register-a-death/register_a_death.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Register a death
+<% end %>
+
+<% text_for :meta_description do %>
+ Find out how to register a death in the UK or abroad
+<% end %>
+
+<% govspeak_for :body do %>
+ Find out how to register a death in the UK or abroad.
+
+ If the person died on a foreign ship or aircraft, you must register the death in the country the ship or aircraft is registered in.
+
+ You can only register a death abroad if it happened on or after 1 January 1983.
+
+<% end %>
diff --git a/lib/smart_answer_flows/register-a-death/register_a_death.govspeak.erb b/lib/smart_answer_flows/register-a-death/register_a_death.govspeak.erb
deleted file mode 100644
index 8419b5af10c..00000000000
--- a/lib/smart_answer_flows/register-a-death/register_a_death.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Register a death
-<% end %>
-
-<% render_content_for :meta_description do %>
- Find out how to register a death in the UK or abroad
-<% end %>
-
-<% render_content_for :body do %>
- Find out how to register a death in the UK or abroad.
-
- If the person died on a foreign ship or aircraft, you must register the death in the country the ship or aircraft is registered in.
-
- You can only register a death abroad if it happened on or after 1 January 1983.
-
-<% 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
new file mode 100644
index 00000000000..2b679d09a59
--- /dev/null
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.erb
@@ -0,0 +1,22 @@
+<% text_for :title do %>
+ You must report your lost or stolen passport
+<% end %>
+
+<% govspeak_for :body do %>
+You can cancel your passport immediately by [reporting it online](https://www.loststolenpassport.service.gov.uk/report/passport-holder).
+
+###Help cancelling your passport
+
+[Contact the Passport Adviceline](https://www.gov.uk/passport-advice-line) if you need help.
+
+##Get a replacement passport
+
+If you do not need to travel urgently, you can [apply for a replacement passport from the country you’re in](/apply-renew-passport-abroad).
+
+##Emergency travel documents
+
+If you need to travel in the next 6 weeks, you may be able to [apply for an emergency travel document](/emergency-travel-document). You will have to pay a fee.
+
+You do not also need to report your passport lost or stolen online - you will do it as part of your emergency travel document application.
+
+<% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb
deleted file mode 100644
index a38b32be0a5..00000000000
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% render_content_for :title do %>
- You must report your lost or stolen passport
-<% end %>
-
-<% render_content_for :body do %>
-You can cancel your passport immediately by [reporting it online](https://www.loststolenpassport.service.gov.uk/report/passport-holder).
-
-###Help cancelling your passport
-
-[Contact the Passport Adviceline](https://www.gov.uk/passport-advice-line) if you need help.
-
-##Get a replacement passport
-
-If you do not need to travel urgently, you can [apply for a replacement passport from the country you’re in](/apply-renew-passport-abroad).
-
-##Emergency travel documents
-
-If you need to travel in the next 6 weeks, you may be able to [apply for an emergency travel document](/emergency-travel-document). You will have to pay a fee.
-
-You do not also need to report your passport lost or stolen online - you will do it as part of your emergency travel document application.
-
-<% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.erb
new file mode 100644
index 00000000000..b3b676272c2
--- /dev/null
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.erb
@@ -0,0 +1,16 @@
+<% govspeak_for :body do %>
+You can cancel your passport immediately by [reporting it online](https://www.loststolenpassport.service.gov.uk/report/passport-holder).
+
+You’ll need to provide a UK mobile number. If you don’t have one, you can use an email address and a landline number.
+
+You'll need to [apply for a replacement passport](https://www.gov.uk/renew-adult-passport/overview) if you want one.
+
+^If you [replace your passport using the paper application form](https://www.gov.uk/renew-adult-passport/replace), fill in section 3 to report your missing passport - you don’t need to report it online as well.^
+
+%You can’t use the [1-day Premium service](https://www.gov.uk/get-a-passport-urgently) if you’re replacing a lost passport.%
+
+###Help cancelling your passport
+
+[Contact the Passport Adviceline](https://www.gov.uk/passport-advice-line) if you need help.
+
+<% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.govspeak.erb
deleted file mode 100644
index 1e4692d78d4..00000000000
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/report_lost_or_stolen_passport.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :body do %>
-You can cancel your passport immediately by [reporting it online](https://www.loststolenpassport.service.gov.uk/report/passport-holder).
-
-You’ll need to provide a UK mobile number. If you don’t have one, you can use an email address and a landline number.
-
-You'll need to [apply for a replacement passport](https://www.gov.uk/renew-adult-passport/overview) if you want one.
-
-^If you [replace your passport using the paper application form](https://www.gov.uk/renew-adult-passport/replace), fill in section 3 to report your missing passport - you don’t need to report it online as well.^
-
-%You can’t use the [1-day Premium service](https://www.gov.uk/get-a-passport-urgently) if you’re replacing a lost passport.%
-
-###Help cancelling your passport
-
-[Contact the Passport Adviceline](https://www.gov.uk/passport-advice-line) if you need help.
-
-<% 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
new file mode 100644
index 00000000000..25d3f80abf5
--- /dev/null
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Where are you?
+<% end %>
+
+<% options(
+ "in_the_uk": "In the UK",
+ "abroad": "Abroad"
+) %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.govspeak.erb
deleted file mode 100644
index f4cdb91ca7c..00000000000
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Where are you?
-<% end %>
-
-<% options(
- "in_the_uk": "In the UK",
- "abroad": "Abroad"
-) %>
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
new file mode 100644
index 00000000000..22f411c95c8
--- /dev/null
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ In which country?
+<% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.govspeak.erb
deleted file mode 100644
index b168e838e4d..00000000000
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..fbbbe870555
--- /dev/null
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Cancel a lost or stolen passport
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ You must cancel a lost or stolen passport as soon as possible.
+
+ This will reduce the risk of anyone else using your passport or your identity.
+
+ You can report a lost or stolen passport for someone else if they can't do it themselves.
+<% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.govspeak.erb
deleted file mode 100644
index b7db86041d1..00000000000
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Cancel a lost or stolen passport
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- You must cancel a lost or stolen passport as soon as possible.
-
- This will reduce the risk of anyone else using your passport or your identity.
-
- You can report a lost or stolen passport for someone else if they can't do it themselves.
-<% end %>
diff --git a/lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb b/lib/smart_answer_flows/shared/_overseas_passports_embassies.erb
similarity index 100%
rename from lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb
rename to lib/smart_answer_flows/shared/_overseas_passports_embassies.erb
diff --git a/lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb b/lib/smart_answer_flows/shared/births_and_deaths_registration/_button.erb
similarity index 100%
rename from lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb
rename to lib/smart_answer_flows/shared/births_and_deaths_registration/_button.erb
diff --git a/lib/smart_answer_flows/shared/births_and_deaths_registration/_document_return_fees.govspeak.erb b/lib/smart_answer_flows/shared/births_and_deaths_registration/_document_return_fees.erb
similarity index 100%
rename from lib/smart_answer_flows/shared/births_and_deaths_registration/_document_return_fees.govspeak.erb
rename to lib/smart_answer_flows/shared/births_and_deaths_registration/_document_return_fees.erb
diff --git a/lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb b/lib/smart_answer_flows/shared/minimum_wage/_acas_information.erb
similarity index 100%
rename from lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb
rename to lib/smart_answer_flows/shared/minimum_wage/_acas_information.erb
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.erb
new file mode 100644
index 00000000000..8b1d6518d1b
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can’t use simplified expenses for your current vehicle because you’ve already claimed capital allowances for it.
+
+ You should continue to claim your actual vehicle expenses, and [capital allowances](/capital-allowances) where relevant.
+
+ If you get a new vehicle and use it for your business, you can claim flat rate simplified expenses for it if it suits you.
+<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.govspeak.erb
deleted file mode 100644
index 4333fa34643..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/capital_allowance_result.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can’t use simplified expenses for your current vehicle because you’ve already claimed capital allowances for it.
-
- You should continue to claim your actual vehicle expenses, and [capital allowances](/capital-allowances) where relevant.
-
- If you get a new vehicle and use it for your business, you can claim flat rate simplified expenses for it if it suits you.
-<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.erb
new file mode 100644
index 00000000000..89fc5bef120
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.erb
@@ -0,0 +1,128 @@
+<% govspeak_for :body do %>
+ <% if calculator.capital_allowance_claimed? &&
+ calculator.neither_new_nor_used_vehicle? %>
+ ##For your vehicle
+
+ You can’t use simplified expenses for your vehicle because you’ve already claimed capital allowances for it.
+
+ You have to continue to calculate your vehicle expenses by working out the actual costs.
+
+ ##For your other business expenses
+
+ <% elsif calculator.simplified_expenses_claimed? &&
+ calculator.neither_new_nor_used_vehicle? %>
+ ##For your vehicle
+
+ You can’t claim capital allowances for your vehicle because you’ve already claimed simplified expenses for it.
+
+ Once you’ve used simplified expenses for a vehicle, you must continue to do so as long as you use that vehicle for your business.
+
+ ##For your other business expenses
+
+ <% end %>
+ Based on your answers you would probably be better off <% if calculator.simple_total > calculator.current_scheme_costs %>using simplified expenses<% else %>working out your expenses based on the actual costs<% end %>.
+
+ These 2 sets of results show what you can claim using each method.
+
+ You don’t have to use the same method for different types of expenses. For example, you can use simplified expenses for vehicle costs but work out the actual costs for working from home.
+
+ ##If you use simplified expenses
+
+ <% if calculator.simple_vehicle_costs_car_van.to_f > 0.0 ||
+ calculator.simple_vehicle_costs_motorcycle > 0.0 ||
+ calculator.simple_home_costs.to_f > 0.0 %>
+ You could claim:
+ <% end %>
+
+ <% unless calculator.capital_allowance_claimed? or calculator.simple_vehicle_costs_car_van.to_f == 0.0 %>
+ <% if calculator.car? || calculator.van? %>
+ - <%= format_money(calculator.simple_vehicle_costs_car_van) %> for your car or van
+ <% end %>
+ <% end %>
+
+ <% if calculator.simple_vehicle_costs_motorcycle.to_f > 0.0 %>
+ <% if calculator.motorcycle? %>
+ - <%= format_money(calculator.simple_vehicle_costs_motorcycle) %> to claim for motorcycles
+ <% end %>
+ <% end %>
+
+ <% if calculator.working_from_home? %>
+ <% if calculator.simple_home_costs.to_f == 0.0 %>
+ - you have to work at least 25 hours per month from home to use simplified expenses
+ <% else %>
+ - <%= format_money(calculator.simple_home_costs) %> to claim for working from home
+ <% end %>
+ <% end %>
+
+ <% if calculator.simple_total == 0.0 %>
+ **Total to claim per year:**
+ <% else %>
+ **Total to claim per year:** <%= format_money(calculator.simple_total) %>
+ <% end %>
+
+ <% if calculator.simple_business_costs.to_f > 0.0 && calculator.living_on_business_premises? %>
+ - <%= format_money(calculator.simple_business_costs) %> to deduct from your total business costs - you then claim the balance
+ <% end %>
+
+ ^This is an estimate. You should do your own calculations for your tax return.^
+
+ ###What to do for your tax return
+
+ Use the [simplified expenses flat rates](/simpler-income-tax-simplified-expenses/vehicles-) to work out your business expenses.
+
+ Multiply the flat rates with either:
+
+ - [the miles you drove](/simpler-income-tax-simplified-expenses/vehicles-)
+ - [the hours you worked from home](/simpler-income-tax-simplified-expenses/working-from-home)
+ - [the number of people who lived on your business premises](/simpler-income-tax-simplified-expenses/living-at-your-business-premises)
+
+ ##If you work out the actual costs
+
+ <% if calculator.vehicle_costs.to_f > 0.0 ||
+ calculator.capital_allowances_estimate > 0.0 ||
+ calculator.home_costs.to_f > 0.0 ||
+ calculator.simple_business_costs.to_f > 0.0 %>
+ You could claim:
+ <% end %>
+
+ <% if calculator.vehicle_costs.to_f > 0.0 %>
+ <% if calculator.car? || calculator.van? || calculator.motorcycle? %>
+ - <%= format_money(calculator.vehicle_costs.to_f) %> for the running costs of your car, van or motorcycle
+ <% end %>
+ <% end %>
+
+ <% if calculator.capital_allowances_estimate > 0.0 %>
+ <% if calculator.car? || calculator.van? || calculator.motorcycle? %>
+ - <%= format_money(calculator.capital_allowances_estimate.to_f) %> of [capital allowances](/capital-allowances) for your car, van or motorcycle
+ <% end %>
+ <% end %>
+
+ <% if calculator.home_costs.to_f > 0.0 && calculator.working_from_home? %>
+ - <%= format_money(calculator.home_costs) %> for working from home
+ <% end %>
+
+ <% if calculator.simple_business_costs.to_f > 0.0 && calculator.living_on_business_premises? %>
+ - <%= format_money(calculator.business_premises_cost) %> to deduct from your total business costs - you then claim the balance
+ <% end %>
+
+ <% if calculator.vehicle_costs.to_f == 0.0 &&
+ calculator.capital_allowances_estimate.to_f == 0.0 &&
+ calculator.home_costs.to_f == 0.0 &&
+ calculator.business_premises_cost.to_f == 0.0 %>
+ **Total to claim per year:**
+ <% else %>
+ **Total to claim per year:** <%= format_money(calculator.vehicle_costs.to_f + calculator.capital_allowances_estimate.to_f + calculator.home_costs.to_f + calculator.business_premises_cost.to_f) %>
+ <% end %>
+
+ <% if calculator.over_limit? %>
+ The upper limit for Capital Allowance write offs for vans is £250,000.
+ <% end %>
+
+ ^This is an estimate. You should do your own calculations for your tax return.^
+
+ ###What to do for your tax return
+
+ You have to work out the split between private and business use for vehicles, working from home or business premises use.
+
+ You then have to add up your expenses for your tax return and [keep records](/self-employed-records) for every expense you want to claim, eg copies of your bills.
+<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.govspeak.erb
deleted file mode 100644
index 90366f66757..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_can_use_result.govspeak.erb
+++ /dev/null
@@ -1,128 +0,0 @@
-<% render_content_for :body do %>
- <% if calculator.capital_allowance_claimed? &&
- calculator.neither_new_nor_used_vehicle? %>
- ##For your vehicle
-
- You can’t use simplified expenses for your vehicle because you’ve already claimed capital allowances for it.
-
- You have to continue to calculate your vehicle expenses by working out the actual costs.
-
- ##For your other business expenses
-
- <% elsif calculator.simplified_expenses_claimed? &&
- calculator.neither_new_nor_used_vehicle? %>
- ##For your vehicle
-
- You can’t claim capital allowances for your vehicle because you’ve already claimed simplified expenses for it.
-
- Once you’ve used simplified expenses for a vehicle, you must continue to do so as long as you use that vehicle for your business.
-
- ##For your other business expenses
-
- <% end %>
- Based on your answers you would probably be better off <% if calculator.simple_total > calculator.current_scheme_costs %>using simplified expenses<% else %>working out your expenses based on the actual costs<% end %>.
-
- These 2 sets of results show what you can claim using each method.
-
- You don’t have to use the same method for different types of expenses. For example, you can use simplified expenses for vehicle costs but work out the actual costs for working from home.
-
- ##If you use simplified expenses
-
- <% if calculator.simple_vehicle_costs_car_van.to_f > 0.0 ||
- calculator.simple_vehicle_costs_motorcycle > 0.0 ||
- calculator.simple_home_costs.to_f > 0.0 %>
- You could claim:
- <% end %>
-
- <% unless calculator.capital_allowance_claimed? or calculator.simple_vehicle_costs_car_van.to_f == 0.0 %>
- <% if calculator.car? || calculator.van? %>
- - <%= format_money(calculator.simple_vehicle_costs_car_van) %> for your car or van
- <% end %>
- <% end %>
-
- <% if calculator.simple_vehicle_costs_motorcycle.to_f > 0.0 %>
- <% if calculator.motorcycle? %>
- - <%= format_money(calculator.simple_vehicle_costs_motorcycle) %> to claim for motorcycles
- <% end %>
- <% end %>
-
- <% if calculator.working_from_home? %>
- <% if calculator.simple_home_costs.to_f == 0.0 %>
- - you have to work at least 25 hours per month from home to use simplified expenses
- <% else %>
- - <%= format_money(calculator.simple_home_costs) %> to claim for working from home
- <% end %>
- <% end %>
-
- <% if calculator.simple_total == 0.0 %>
- **Total to claim per year:**
- <% else %>
- **Total to claim per year:** <%= format_money(calculator.simple_total) %>
- <% end %>
-
- <% if calculator.simple_business_costs.to_f > 0.0 && calculator.living_on_business_premises? %>
- - <%= format_money(calculator.simple_business_costs) %> to deduct from your total business costs - you then claim the balance
- <% end %>
-
- ^This is an estimate. You should do your own calculations for your tax return.^
-
- ###What to do for your tax return
-
- Use the [simplified expenses flat rates](/simpler-income-tax-simplified-expenses/vehicles-) to work out your business expenses.
-
- Multiply the flat rates with either:
-
- - [the miles you drove](/simpler-income-tax-simplified-expenses/vehicles-)
- - [the hours you worked from home](/simpler-income-tax-simplified-expenses/working-from-home)
- - [the number of people who lived on your business premises](/simpler-income-tax-simplified-expenses/living-at-your-business-premises)
-
- ##If you work out the actual costs
-
- <% if calculator.vehicle_costs.to_f > 0.0 ||
- calculator.capital_allowances_estimate > 0.0 ||
- calculator.home_costs.to_f > 0.0 ||
- calculator.simple_business_costs.to_f > 0.0 %>
- You could claim:
- <% end %>
-
- <% if calculator.vehicle_costs.to_f > 0.0 %>
- <% if calculator.car? || calculator.van? || calculator.motorcycle? %>
- - <%= format_money(calculator.vehicle_costs.to_f) %> for the running costs of your car, van or motorcycle
- <% end %>
- <% end %>
-
- <% if calculator.capital_allowances_estimate > 0.0 %>
- <% if calculator.car? || calculator.van? || calculator.motorcycle? %>
- - <%= format_money(calculator.capital_allowances_estimate.to_f) %> of [capital allowances](/capital-allowances) for your car, van or motorcycle
- <% end %>
- <% end %>
-
- <% if calculator.home_costs.to_f > 0.0 && calculator.working_from_home? %>
- - <%= format_money(calculator.home_costs) %> for working from home
- <% end %>
-
- <% if calculator.simple_business_costs.to_f > 0.0 && calculator.living_on_business_premises? %>
- - <%= format_money(calculator.business_premises_cost) %> to deduct from your total business costs - you then claim the balance
- <% end %>
-
- <% if calculator.vehicle_costs.to_f == 0.0 &&
- calculator.capital_allowances_estimate.to_f == 0.0 &&
- calculator.home_costs.to_f == 0.0 &&
- calculator.business_premises_cost.to_f == 0.0 %>
- **Total to claim per year:**
- <% else %>
- **Total to claim per year:** <%= format_money(calculator.vehicle_costs.to_f + calculator.capital_allowances_estimate.to_f + calculator.home_costs.to_f + calculator.business_premises_cost.to_f) %>
- <% end %>
-
- <% if calculator.over_limit? %>
- The upper limit for Capital Allowance write offs for vans is £250,000.
- <% end %>
-
- ^This is an estimate. You should do your own calculations for your tax return.^
-
- ###What to do for your tax return
-
- You have to work out the split between private and business use for vehicles, working from home or business premises use.
-
- You then have to add up your expenses for your tax return and [keep records](/self-employed-records) for every expense you want to claim, eg copies of your bills.
-<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.erb
new file mode 100644
index 00000000000..78c5aa1c81f
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can’t claim capital allowances for your vehicle because you’ve already claimed simplified expenses for it.
+
+ Once you’ve used simplified expenses for a vehicle, you must continue to do so as long as you use that vehicle for your business.
+
+ If you get a new vehicle and use it for your business, you can capital allowances for it it if suits you.
+<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.govspeak.erb
deleted file mode 100644
index cea7ad9af2d..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_claim_capital_allowance.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can’t claim capital allowances for your vehicle because you’ve already claimed simplified expenses for it.
-
- Once you’ve used simplified expenses for a vehicle, you must continue to do so as long as you use that vehicle for your business.
-
- If you get a new vehicle and use it for your business, you can capital allowances for it it if suits you.
-<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.erb
new file mode 100644
index 00000000000..dd7fc9ce196
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can use [simplified expenses](/simpler-income-tax-simplified-expenses) for your vehicle.
+
+ You cannot use simplified expenses for working from home.
+
+ You'll need to [work out the actual costs](/expenses-if-youre-self-employed) for working from home when calculating your business expenses for your [Self Assessment tax return](/self-assessment-tax-returns).
+
+ [Records you need to keep when self-employed](/self-employed-records)
+<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.govspeak.erb
deleted file mode 100644
index 03c4827e235..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/outcomes/you_cant_use_result.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can use [simplified expenses](/simpler-income-tax-simplified-expenses) for your vehicle.
-
- You cannot use simplified expenses for working from home.
-
- You'll need to [work out the actual costs](/expenses-if-youre-self-employed) for working from home when calculating your business expenses for your [Self Assessment tax return](/self-assessment-tax-returns).
-
- [Records you need to keep when self-employed](/self-employed-records)
-<% 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
new file mode 100644
index 00000000000..b15843fa2c9
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.erb
@@ -0,0 +1,9 @@
+<% 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 %>
+
+<% options(
+ "new": "Yes - new and unused",
+ "used": "Yes - second hand",
+ "no": "No - I've used my vehicle for my business in a previous tax year"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.govspeak.erb
deleted file mode 100644
index ee41a3160e0..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_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 %>
-
-<% options(
- "new": "Yes - new and unused",
- "used": "Yes - second hand",
- "no": "No - I've used my vehicle for my business in a previous tax year"
-) %>
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
new file mode 100644
index 00000000000..b566b1c145d
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Have you claimed capital allowances or simplified expenses for your existing vehicle before?
+<% end %>
+
+<% options(
+ "capital_allowance": "Yes - capital allowances",
+ "simplified_expenses": "Yes - simplified expenses",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.govspeak.erb
deleted file mode 100644
index 0ebe43ae870..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Have you claimed capital allowances or simplified expenses for your existing vehicle before?
-<% end %>
-
-<% options(
- "capital_allowance": "Yes - capital allowances",
- "simplified_expenses": "Yes - simplified expenses",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..0ab609d48ac
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Was your car new or second-hand when you started using it for your business?
+<% end %>
+
+<% options(
+ "new": "New",
+ "used": "Second hand"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.govspeak.erb
deleted file mode 100644
index 2de1407bd76..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Was your car new or second-hand when you started using it for your business?
-<% end %>
-
-<% options(
- "new": "New",
- "used": "Second hand"
-) %>
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
new file mode 100644
index 00000000000..e934da85498
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.erb
@@ -0,0 +1,12 @@
+<% text_for :title do %>
+ Have you claimed expenses for your current business before?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
+
+<% 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/claimed_expenses_for_current_business.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.govspeak.erb
deleted file mode 100644
index 383e7df9a5f..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :title do %>
- Have you claimed expenses for your current business before?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..194d6c91b91
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much of your home costs do you expect to claim as business expenses this tax year?
+<% end %>
+
+<% 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/current_claim_amount_home.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.govspeak.erb
deleted file mode 100644
index 318f4d73062..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..d699f7d66c3
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.erb
@@ -0,0 +1,7 @@
+<% 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 %>
+
+<% 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/deduct_from_premises.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.govspeak.erb
deleted file mode 100644
index 6e91ee6ac72..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..77fafe1e07d
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.erb
@@ -0,0 +1,3 @@
+<% 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_car_van.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.govspeak.erb
deleted file mode 100644
index e35fba832b1..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..dda97aeae64
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.erb
@@ -0,0 +1,3 @@
+<% 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/drive_business_miles_motorcycle.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.govspeak.erb
deleted file mode 100644
index 19b467ccf92..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..0b8ab43c98d
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Do you have either of these expenses as part of your business?
+<% end %>
+
+<% options(
+ "using_home_for_business": "Using home for business (you work from home all or some of the time)",
+ "live_on_business_premises": "Living on your business premises (eg guesthouses or B&Bs)",
+ "no_expense": "Neither of these"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.govspeak.erb
deleted file mode 100644
index 243ab947404..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Do you have either of these expenses as part of your business?
-<% end %>
-
-<% options(
- "using_home_for_business": "Using home for business (you work from home all or some of the time)",
- "live_on_business_premises": "Living on your business premises (eg guesthouses or B&Bs)",
- "no_expense": "Neither of these"
-) %>
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
new file mode 100644
index 00000000000..c1ace4cba16
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ On average, how many hours a month do you work or expect to work from home?
+<% end %>
+
+<% 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/hours_work_home.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.govspeak.erb
deleted file mode 100644
index 63e20ca584a..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..d7d048c6d59
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.erb
@@ -0,0 +1,7 @@
+<% 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 %>
+
+<% 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/how_much_expect_to_claim.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.govspeak.erb
deleted file mode 100644
index 1c2bdc4362c..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..bca9dd1446f
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ What are the car’s CO2 emissions?
+<% end %>
+
+<% govspeak_for :body do %>
+ Check your car's CO2 emissions.
+<% end %>
+
+<% options(
+ "low": "75g/km or less (or it’s electric)",
+ "medium": "between 75g/km and 130g/km",
+ "high": "over 130g/km"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.govspeak.erb
deleted file mode 100644
index fe0df2c267a..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- What are the car’s CO2 emissions?
-<% end %>
-
-<% render_content_for :body do %>
- Check your car's CO2 emissions.
-<% end %>
-
-<% options(
- "low": "75g/km or less (or it’s electric)",
- "medium": "between 75g/km and 130g/km",
- "high": "over 130g/km"
-) %>
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
new file mode 100644
index 00000000000..ea8b9aa8930
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How many people normally live on the business premises?
+<% end %>
+
+<% 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/people_live_on_premises.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.govspeak.erb
deleted file mode 100644
index 5736bdea64e..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How many people normally live on the business premises?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..cfde3aec9d9
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ How much did you pay for the vehicle?
+<% end %>
+
+<% 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/price_of_vehicle.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.govspeak.erb
deleted file mode 100644
index 33744c4881c..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- How much did you pay for the vehicle?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..14dd39c9378
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ Do you have any of these expenses as part of your business?
+<% end %>
+
+<% options(
+ "car": "Car",
+ "van": "Van",
+ "motorcycle": "Motorcycle (business use)",
+ "using_home_for_business": "Working from home (the main purpose of the building is your home)",
+ "live_on_business_premises": "Living on your business premises (the main purpose of the building where you live is your business, eg a B&B, and you're likely to pay business rates instead of council tax)"
+) %>
+
+<% text_for :hint do %>
+ If you don't have any of these expenses go to 'Next step'.
+<% end %>
+
+<% 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/type_of_expense.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.govspeak.erb
deleted file mode 100644
index 53b8e4858f4..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- Do you have any of these expenses as part of your business?
-<% end %>
-
-<% options(
- "car": "Car",
- "van": "Van",
- "motorcycle": "Motorcycle (business use)",
- "using_home_for_business": "Working from home (the main purpose of the building is your home)",
- "live_on_business_premises": "Living on your business premises (the main purpose of the building where you live is your business, eg a B&B, and you're likely to pay business rates instead of council tax)"
-) %>
-
-<% render_content_for :hint do %>
- If you don't have any of these expenses go to 'Next step'.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a19e67b39b0
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much of the time will you use the vehicle for business?
+<% end %>
+
+<% text_for :suffix_label do %>
+ % of the time
+<% end %>
+
+<% 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_business_use_time.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.govspeak.erb
deleted file mode 100644
index 083ed4f6c28..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much of the time will you use the vehicle for business?
-<% end %>
-
-<% render_content_for :suffix_label do %>
- % of the time
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..f71fb25ae8e
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Do you have a vehicle that you use for your business?
+<% end %>
+
+<% options(
+ "car": "Car",
+ "van": "Van",
+ "motorcycle": "Motorcycle",
+ "no_vehicle": "No - I don’t have a vehicle"
+) %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.govspeak.erb
deleted file mode 100644
index b5374db4ec8..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Do you have a vehicle that you use for your business?
-<% end %>
-
-<% options(
- "car": "Car",
- "van": "Van",
- "motorcycle": "Motorcycle",
- "no_vehicle": "No - I don’t have a vehicle"
-) %>
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
new file mode 100644
index 00000000000..73e17e561b5
--- /dev/null
+++ b/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.erb
@@ -0,0 +1,33 @@
+<% text_for :title do %>
+ Check if simplified expenses could save your business money
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ If you’re a sole trader or partnership there are 2 ways you can calculate business expenses for vehicles, working from home and living on your business premises. You can use [simplified expenses](/simpler-income-tax-simplified-expenses) or calculate your expenses by working out the actual costs.
+
+ Use this checker to work out which method is best for you.
+
+ ## What you need to know:
+
+ You’ll be asked to make estimates about some of your business expenses.
+
+ This tool:
+
+ + doesn't give exact figures to use in your tax return - it tells you which way of calculating expenses might save you money
+ + can only give an answer for one vehicle at a time - if you have several vehicles, start at the beginning for each vehicle
+
+ ## Who can’t use this tool
+
+ Don’t use this tool for vehicle expenses if:
+
+ - you use [cash basis](/simpler-income-tax-cash-basis) and you’ve already deducted your vehicle as a capital cost
+ - the vehicle you’re claiming for is used by an employee and you [pay tax on it as a benefit](https://www.gov.uk/employer-reporting-expenses-benefits)
+ - you’re claiming for a car and you started using it for your business before April 2015
+
+ ^You have to be sole trader or business partnership - limited companies and limited liability partnerships can’t claim simplified expenses.^
+
+<% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.govspeak.erb b/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.govspeak.erb
deleted file mode 100644
index de7fea5e156..00000000000
--- a/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% render_content_for :title do %>
- Check if simplified expenses could save your business money
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- If you’re a sole trader or partnership there are 2 ways you can calculate business expenses for vehicles, working from home and living on your business premises. You can use [simplified expenses](/simpler-income-tax-simplified-expenses) or calculate your expenses by working out the actual costs.
-
- Use this checker to work out which method is best for you.
-
- ## What you need to know:
-
- You’ll be asked to make estimates about some of your business expenses.
-
- This tool:
-
- + doesn't give exact figures to use in your tax return - it tells you which way of calculating expenses might save you money
- + can only give an answer for one vehicle at a time - if you have several vehicles, start at the beginning for each vehicle
-
- ## Who can’t use this tool
-
- Don’t use this tool for vehicle expenses if:
-
- - you use [cash basis](/simpler-income-tax-cash-basis) and you’ve already deducted your vehicle as a capital cost
- - the vehicle you’re claiming for is used by an employee and you [pay tax on it as a benefit](https://www.gov.uk/employer-reporting-expenses-benefits)
- - you’re claiming for a car and you started using it for your business before April 2015
-
- ^You have to be sole trader or business partnership - limited companies and limited liability partnerships can’t claim simplified expenses.^
-
-<% 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
new file mode 100644
index 00000000000..567727b3ba6
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Your bus pass age
+
+<% end %>
+
+<% govspeak_for :body do %>
+ The date you qualify for a bus pass is:
+
+ - on <%= format_date(calculator.bus_pass_qualification_date) %>, if you live in England
+ - when you turn 60 years old, if you live in [Scotland](http://www.transportscotland.gov.uk/public-transport/concessionary-travel-people-aged-60-or-disability),[Wales](http://wales.gov.uk/topics/transport/public/concessionary/?lang=en) or [Northern Ireland](http://www.nidirect.gov.uk/free-bus-travel-and-concessions)
+
+ The dates may be different in some areas, check with your council when you can [apply for a bus pass](/apply-for-elderly-person-bus-pass).
+
+ You can get a 60+ Oyster card from [Transport for London](https://www.tfl.gov.uk/fares-and-payments/adult-discounts-and-concessions/60-london-oyster?intcmp=1763) if you live in Greater London.
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.govspeak.erb b/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.govspeak.erb
deleted file mode 100644
index 88eb97d0914..00000000000
--- a/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Your bus pass age
-
-<% end %>
-
-<% render_content_for :body do %>
- The date you qualify for a bus pass is:
-
- - on <%= format_date(calculator.bus_pass_qualification_date) %>, if you live in England
- - when you turn 60 years old, if you live in [Scotland](http://www.transportscotland.gov.uk/public-transport/concessionary-travel-people-aged-60-or-disability),[Wales](http://wales.gov.uk/topics/transport/public/concessionary/?lang=en) or [Northern Ireland](http://www.nidirect.gov.uk/free-bus-travel-and-concessions)
-
- The dates may be different in some areas, check with your council when you can [apply for a bus pass](/apply-for-elderly-person-bus-pass).
-
- You can get a 60+ Oyster card from [Transport for London](https://www.tfl.gov.uk/fares-and-payments/adult-discounts-and-concessions/60-london-oyster?intcmp=1763) if you live in Greater London.
-<% 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
new file mode 100644
index 00000000000..950446899a4
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.erb
@@ -0,0 +1,19 @@
+<% text_for :title do %>
+ You reached State Pension age on <%= format_date(calculator.state_pension_date) %>.
+
+<% end %>
+
+<% govspeak_for :body do %>
+ Your State Pension age was <%= calculator.state_pension_age %>.
+
+ You should have got your pension claim pack before you reached your State Pension age.
+
+ Contact the Pension Service on 0800 731 7898 if you haven't received it.
+
+ ^You've already reached State Pension age. You can [claim your State Pension](<%= calculator.how_to_claim_url %>) if you haven’t already or [defer claiming it](/deferring-state-pension "Deferring your State Pension").^
+
+ ##Pension Credit
+ You might get [Pension Credit](/pension-credit) if you’re retired and on a low income.
+
+ You’ve already reached the Pension Credit qualifying age. Check if you’re eligible to claim [Pension Credit](/pension-credit/eligibility).
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.govspeak.erb b/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.govspeak.erb
deleted file mode 100644
index 0a9add72cfb..00000000000
--- a/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :title do %>
- You reached State Pension age on <%= format_date(calculator.state_pension_date) %>.
-
-<% end %>
-
-<% render_content_for :body do %>
- Your State Pension age was <%= calculator.state_pension_age %>.
-
- You should have got your pension claim pack before you reached your State Pension age.
-
- Contact the Pension Service on 0800 731 7898 if you haven't received it.
-
- ^You've already reached State Pension age. You can [claim your State Pension](<%= calculator.how_to_claim_url %>) if you haven’t already or [defer claiming it](/deferring-state-pension "Deferring your State Pension").^
-
- ##Pension Credit
- You might get [Pension Credit](/pension-credit) if you’re retired and on a low income.
-
- You’ve already reached the Pension Credit qualifying age. Check if you’re eligible to claim [Pension Credit](/pension-credit/eligibility).
-<% 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
new file mode 100644
index 00000000000..bb8a7fc7606
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.erb
@@ -0,0 +1,40 @@
+<% text_for :title do %>
+ You’ll reach State Pension age on <%= format_date(calculator.state_pension_date) %>.
+
+<% end %>
+
+<% govspeak_for :body do %>
+ Your State Pension age is <%= calculator.state_pension_age %>.
+
+ <% if calculator.rolling_increase_period? %>
+ ^This may increase by up to a year following [review of the State Pension age](/government/news/proposed-new-timetable-for-state-pension-age-increases).^
+ <% else %>
+ ^[The State Pension age is under review](/government/news/proposed-new-timetable-for-state-pension-age-increases) and may change in the future.^
+ <% end %>
+
+ <% if calculator.can_apply? %>
+ You can [claim your State Pension](<%= calculator.how_to_claim_url %>) now. Your payments will start after you reach State Pension age.
+
+ Alternatively, you can [delay (defer) claiming](/deferring-state-pension).
+ <% end %>
+
+ <% if calculator.old_state_pension? %>
+ Find out more information about the [basic State Pension](/state-pension).
+ <% else %>
+ Find out more information about the [new State Pension](/new-state-pension).
+ <% end %>
+
+ <% if calculator.before_state_pension_date?(days: 30) && calculator.over_16_years_old? %>
+ ^You can get a [forecast or statement of how much State Pension you may get](/state-pension-statement).^
+ <% end %>
+
+ ##Pension Credit
+ You might get [Pension Credit](/pension-credit) if you’re retired and on a low income.
+
+ <% if calculator.before_pension_credit_date? %>
+ You'll reach the Pension Credit qualifying age on <%= format_date(calculator.pension_credit_date) %>.
+ <% else %>
+ You’ve already reached the Pension Credit qualifying age. Check if you’re eligible to claim [Pension Credit](/pension-credit/eligibility).
+ <% end %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.govspeak.erb b/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.govspeak.erb
deleted file mode 100644
index 38f153a09ab..00000000000
--- a/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.govspeak.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<% render_content_for :title do %>
- You’ll reach State Pension age on <%= format_date(calculator.state_pension_date) %>.
-
-<% end %>
-
-<% render_content_for :body do %>
- Your State Pension age is <%= calculator.state_pension_age %>.
-
- <% if calculator.rolling_increase_period? %>
- ^This may increase by up to a year following [review of the State Pension age](/government/news/proposed-new-timetable-for-state-pension-age-increases).^
- <% else %>
- ^[The State Pension age is under review](/government/news/proposed-new-timetable-for-state-pension-age-increases) and may change in the future.^
- <% end %>
-
- <% if calculator.can_apply? %>
- You can [claim your State Pension](<%= calculator.how_to_claim_url %>) now. Your payments will start after you reach State Pension age.
-
- Alternatively, you can [delay (defer) claiming](/deferring-state-pension).
- <% end %>
-
- <% if calculator.old_state_pension? %>
- Find out more information about the [basic State Pension](/state-pension).
- <% else %>
- Find out more information about the [new State Pension](/new-state-pension).
- <% end %>
-
- <% if calculator.before_state_pension_date?(days: 30) && calculator.over_16_years_old? %>
- ^You can get a [forecast or statement of how much State Pension you may get](/state-pension-statement).^
- <% end %>
-
- ##Pension Credit
- You might get [Pension Credit](/pension-credit) if you’re retired and on a low income.
-
- <% if calculator.before_pension_credit_date? %>
- You'll reach the Pension Credit qualifying age on <%= format_date(calculator.pension_credit_date) %>.
- <% else %>
- You’ve already reached the Pension Credit qualifying age. Check if you’re eligible to claim [Pension Credit](/pension-credit/eligibility).
- <% end %>
-
-<% 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
new file mode 100644
index 00000000000..8deec17976f
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/questions/dob_age.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ What is your date of birth?
+<% end %>
+
+<% text_for :error_message do %>
+ Enter your date of birth
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/questions/dob_age.govspeak.erb b/lib/smart_answer_flows/state-pension-age/questions/dob_age.govspeak.erb
deleted file mode 100644
index 2ef2bb944f9..00000000000
--- a/lib/smart_answer_flows/state-pension-age/questions/dob_age.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- What is your date of birth?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..aa9a1cb914d
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/questions/gender.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you a man or a woman?
+<% end %>
+
+<% options(
+ "male": "Man",
+ "female": "Woman"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-age/questions/gender.govspeak.erb b/lib/smart_answer_flows/state-pension-age/questions/gender.govspeak.erb
deleted file mode 100644
index e5a0772d047..00000000000
--- a/lib/smart_answer_flows/state-pension-age/questions/gender.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you a man or a woman?
-<% end %>
-
-<% options(
- "male": "Man",
- "female": "Woman"
-) %>
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
new file mode 100644
index 00000000000..fcb472ca2f7
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/questions/which_calculation.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ What would you like to calculate?
+<% end %>
+
+<% options(
+ "age": "State Pension age - including Pension Credit qualifying age",
+ "bus_pass": "Bus pass age - find out when you’ll get free bus travel"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-age/questions/which_calculation.govspeak.erb b/lib/smart_answer_flows/state-pension-age/questions/which_calculation.govspeak.erb
deleted file mode 100644
index 1f39f584a63..00000000000
--- a/lib/smart_answer_flows/state-pension-age/questions/which_calculation.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- What would you like to calculate?
-<% end %>
-
-<% options(
- "age": "State Pension age - including Pension Credit qualifying age",
- "bus_pass": "Bus pass age - find out when you’ll get free bus travel"
-) %>
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
new file mode 100644
index 00000000000..adb024223f4
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-age/state_pension_age.erb
@@ -0,0 +1,28 @@
+<% text_for :title do %>
+ Check your State Pension age
+<% end %>
+
+<% text_for :meta_description do %>
+ Work out your State Pension age and Pension Credit qualifying age
+<% end %>
+
+<% govspeak_for :body do %>
+Your State Pension age is the earliest age you can start receiving your State Pension. It may be different to the age you can get a [workplace or personal pension](/early-retirement-pension/personal-and-workplace-pensions).
+
+Your State Pension age is worked out based on your gender and date of birth.
+
+^[The State Pension age is under review](/government/news/proposed-new-timetable-for-state-pension-age-increases) and may change in the future.^
+
+Use this tool to check:
+
+- when you'll reach State Pension age
+- your Pension Credit qualifying age
+- when you'll be eligible for free bus travel
+
+<% end %>
+
+<% govspeak_for :post_body do %>
+You can [keep working after you reach State Pension age](/working-retirement-pension-age). ‘Default retirement age’ (a forced retirement age of 65) no longer exists.
+
+[Check your State Pension forecast](/check-state-pension) to find out how much money you’ll get.
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/state_pension_age.govspeak.erb b/lib/smart_answer_flows/state-pension-age/state_pension_age.govspeak.erb
deleted file mode 100644
index 638611795e9..00000000000
--- a/lib/smart_answer_flows/state-pension-age/state_pension_age.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :title do %>
- Check your State Pension age
-<% end %>
-
-<% render_content_for :meta_description do %>
- Work out your State Pension age and Pension Credit qualifying age
-<% end %>
-
-<% render_content_for :body do %>
-Your State Pension age is the earliest age you can start receiving your State Pension. It may be different to the age you can get a [workplace or personal pension](/early-retirement-pension/personal-and-workplace-pensions).
-
-Your State Pension age is worked out based on your gender and date of birth.
-
-^[The State Pension age is under review](/government/news/proposed-new-timetable-for-state-pension-age-increases) and may change in the future.^
-
-Use this tool to check:
-
-- when you'll reach State Pension age
-- your Pension Credit qualifying age
-- when you'll be eligible for free bus travel
-
-<% end %>
-
-<% render_content_for :post_body do %>
-You can [keep working after you reach State Pension age](/working-retirement-pension-age). ‘Default retirement age’ (a forced retirement age of 65) no longer exists.
-
-[Check your State Pension forecast](/check-state-pension) to find out how much money you’ll get.
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/_increase_retirement_income.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/_increase_retirement_income.erb
similarity index 100%
rename from lib/smart_answer_flows/state-pension-through-partner/outcomes/_increase_retirement_income.govspeak.erb
rename to lib/smart_answer_flows/state-pension-through-partner/outcomes/_increase_retirement_income.erb
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.erb
new file mode 100644
index 00000000000..16be1a4eefc
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.erb
@@ -0,0 +1,80 @@
+<% govspeak_for :body do %>
+ You might be able to increase your State Pension depending on when you reach State Pension age.
+
+ ##You reached State Pension age before 6 April 2016
+
+ You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+ - your former spouse or civil partner had enough National Insurance contributions
+
+ If your former spouse or civil partner reached or will reach State Pension age on or after 6 April 2016, only their National Insurance contributions up to 5 April 2016 can be used.
+
+ ^You won't have received this increase if you were divorced or your civil partnership was dissolved and you remarried or formed a new civil partnership before you reached State Pension age.^
+
+ ##You reach State Pension age on or after 6 April 2016
+
+ Your State Pension will normally be based on your own National Insurance contributions only.
+
+ Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
+
+ - you paid National Insurance contributions at a reduced rate
+ - you chose not to pay Class 2 contributions if you were self-employed
+
+ This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
+
+ ^Your State Pension may be higher if the reduced rate election applies to you.^
+
+ The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
+
+ $E
+
+ **Example**
+
+ You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
+
+ You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
+
+ Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
+
+ $E
+
+ ##What you may get if you have a reduced rate election
+
+ You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
+
+ You’ll get a pension of about <%= format_money(calculator.higher_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
+
+ <%= format_money(calculator.higher_basic_state_pension_rate) %> is the maximum rate of basic State Pension a divorced person who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
+
+ You’ll get this when you’re divorced or when you claim your State Pension, if later.
+
+ You’ll get more if your [State Pension](/new-state-pension) is higher under your own National Insurance contributions.
+
+###If you remarry or form a new civil partnership before you reach State Pension age
+
+ You’ll get a pension of about <%= format_money(calculator.lower_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
+
+ You’ll get this when either you or your new spouse or civil partner reach [State Pension age](/state-pension-age), whichever is later.
+
+ If your new spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
+
+ <%= format_money(calculator.lower_basic_state_pension_rate) %> is the maximum rate of basic State Pension a married person or civil partner who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
+
+If your [State Pension](/new-state-pension) is higher under your own National Insurance contributions, you’ll get that instead.
+
+ ##Shared additional State Pension or Protected Payment
+
+ The courts may decide to award you a share of your former spouse or civil partner’s [Additional State Pension](/additional-state-pension/further-information) if one of the following applies:
+
+ - they reached State Pension age before 6 April 2016
+ - they reached, or will reach, State Pension age on or after 6 April 2016 and divorce or dissolution proceedings began before 6 April 2016.
+
+ The courts may decide to award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) if both the following apply:
+
+ - they reached, or will reach State Pension age on or after 6 April 2016
+ - divorce or dissolution proceedings began on or after 6 April 2016.
+
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.govspeak.erb
deleted file mode 100644
index 5fe4bba83e3..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/age_dependent_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-<% render_content_for :body do %>
- You might be able to increase your State Pension depending on when you reach State Pension age.
-
- ##You reached State Pension age before 6 April 2016
-
- You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
- - your former spouse or civil partner had enough National Insurance contributions
-
- If your former spouse or civil partner reached or will reach State Pension age on or after 6 April 2016, only their National Insurance contributions up to 5 April 2016 can be used.
-
- ^You won't have received this increase if you were divorced or your civil partnership was dissolved and you remarried or formed a new civil partnership before you reached State Pension age.^
-
- ##You reach State Pension age on or after 6 April 2016
-
- Your State Pension will normally be based on your own National Insurance contributions only.
-
- Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
-
- - you paid National Insurance contributions at a reduced rate
- - you chose not to pay Class 2 contributions if you were self-employed
-
- This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
-
- ^Your State Pension may be higher if the reduced rate election applies to you.^
-
- The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
-
- $E
-
- **Example**
-
- You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
-
- You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
-
- Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
-
- $E
-
- ##What you may get if you have a reduced rate election
-
- You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
-
- You’ll get a pension of about <%= format_money(calculator.higher_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
-
- <%= format_money(calculator.higher_basic_state_pension_rate) %> is the maximum rate of basic State Pension a divorced person who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
-
- You’ll get this when you’re divorced or when you claim your State Pension, if later.
-
- You’ll get more if your [State Pension](/new-state-pension) is higher under your own National Insurance contributions.
-
-###If you remarry or form a new civil partnership before you reach State Pension age
-
- You’ll get a pension of about <%= format_money(calculator.lower_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
-
- You’ll get this when either you or your new spouse or civil partner reach [State Pension age](/state-pension-age), whichever is later.
-
- If your new spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
-
- <%= format_money(calculator.lower_basic_state_pension_rate) %> is the maximum rate of basic State Pension a married person or civil partner who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
-
-If your [State Pension](/new-state-pension) is higher under your own National Insurance contributions, you’ll get that instead.
-
- ##Shared additional State Pension or Protected Payment
-
- The courts may decide to award you a share of your former spouse or civil partner’s [Additional State Pension](/additional-state-pension/further-information) if one of the following applies:
-
- - they reached State Pension age before 6 April 2016
- - they reached, or will reach, State Pension age on or after 6 April 2016 and divorce or dissolution proceedings began before 6 April 2016.
-
- The courts may decide to award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) if both the following apply:
-
- - they reached, or will reach State Pension age on or after 6 April 2016
- - divorce or dissolution proceedings began on or after 6 April 2016.
-
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.erb
new file mode 100644
index 00000000000..5402442657b
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.erb
@@ -0,0 +1,33 @@
+<% govspeak_for :body do %>
+ You might be able to increase the amount of [basic State Pension](/state-pension) to <%= format_money(calculator.lower_basic_state_pension_rate) %> per week if:
+
+ - your spouse or civil partner made enough National Insurance contributions before 6 April 2016
+ - your spouse or civil partner was born on or after 6 April 1950 (this rule doesn’t apply to you if you’re a woman married to a man, or if you’re a woman married to a woman who legally changed their gender after the marriage)
+
+ One of the following must also apply:
+
+ - you don’t qualify for any basic State Pension
+ - your basic State pension is less than <%= format_money(calculator.lower_basic_state_pension_rate) %> per week
+
+ You’ll get the increase when your spouse or civil partner reaches [State Pension age](/state-pension-age).
+
+ ##If you become widowed or your civil partner dies
+
+ You may be able to increase your [basic State Pension](/state-pension) up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+ - your late spouse or civil partner made enough National Insurance contributions before 6 April 2016
+
+ You may also inherit some of their [Additional State Pension](/additional-state-pension) based on their contributions up to 5 April 2016 and half their Graduated Retirement Benefit (the earnings-related State Pension between 1961 and 1975).
+
+ ##If you get divorced or your civil partnership is dissolved
+
+ You may be able to increase your [basic State Pension](/state-pension) up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+ - your former spouse or civil partner had enough National Insurance contributions before 6 April 2016
+
+ The courts may award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) as part of your settlement.
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.govspeak.erb
deleted file mode 100644
index 29444ed7d9d..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_national_insurance_no_state_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% render_content_for :body do %>
- You might be able to increase the amount of [basic State Pension](/state-pension) to <%= format_money(calculator.lower_basic_state_pension_rate) %> per week if:
-
- - your spouse or civil partner made enough National Insurance contributions before 6 April 2016
- - your spouse or civil partner was born on or after 6 April 1950 (this rule doesn’t apply to you if you’re a woman married to a man, or if you’re a woman married to a woman who legally changed their gender after the marriage)
-
- One of the following must also apply:
-
- - you don’t qualify for any basic State Pension
- - your basic State pension is less than <%= format_money(calculator.lower_basic_state_pension_rate) %> per week
-
- You’ll get the increase when your spouse or civil partner reaches [State Pension age](/state-pension-age).
-
- ##If you become widowed or your civil partner dies
-
- You may be able to increase your [basic State Pension](/state-pension) up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
- - your late spouse or civil partner made enough National Insurance contributions before 6 April 2016
-
- You may also inherit some of their [Additional State Pension](/additional-state-pension) based on their contributions up to 5 April 2016 and half their Graduated Retirement Benefit (the earnings-related State Pension between 1961 and 1975).
-
- ##If you get divorced or your civil partnership is dissolved
-
- You may be able to increase your [basic State Pension](/state-pension) up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
- - your former spouse or civil partner had enough National Insurance contributions before 6 April 2016
-
- The courts may award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) as part of your settlement.
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.erb
new file mode 100644
index 00000000000..a222868332e
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.erb
@@ -0,0 +1,33 @@
+<% govspeak_for :body do %>
+ You might be able to increase the amount of [basic State Pension](/state-pension) to <%= format_money(calculator.lower_basic_state_pension_rate) %> per week if:
+
+ - your spouse or civil partner has enough National Insurance contributions
+ - your spouse or civil partner was born on or after 6 April 1950 (this rule doesn’t apply to you if you’re a woman married to a man, or if you’re a woman married to a woman who legally changed their gender from male to female after the marriage began)
+
+ One of the following must also apply:
+
+ - you don’t qualify for any basic State Pension
+ - your basic State pension is less than <%= format_money(calculator.lower_basic_state_pension_rate) %> per week
+
+ You’ll normally have got the increase when either you or your spouse or civil partner reached State Pension age, whichever was later. If you think you qualify but you’re not getting the increase, contact [The Pension Service](/contact-pension-service).
+
+ ##If you become widowed or your civil partner dies
+
+ You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+ - your late spouse or civil partner had enough National Insurance contributions
+
+ You may also inherit a portion of their [Additional State-Pension](/additional-state-pension) and a portion of any [State Pension top up](/voluntary-national-insurance-contributions/top-up-your-state-pension). If they had [put off claiming their State Pension](/deferring-state-pension/tax-and-inheritance) you may inherit a portion of their deferral payment. You may also inherit half their Graduated Retirement Benefit (the earnings-related State Pension people could build up between 1961 and 1975).
+
+ ##If you get divorced or your civil partnership is dissolved
+
+ You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own [basic State Pension](/state-pension) is less than <%= format_money(calculator.higher_basic_state_pension_rate) %>
+ - your former spouse or civil partner had enough National Insurance contributions
+
+ The courts may award you a share of your former spouse or civil partner’s Additional State Pension as part of your settlement.
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.govspeak.erb
deleted file mode 100644
index d44e4b1252e..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/current_rules_no_additional_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% render_content_for :body do %>
- You might be able to increase the amount of [basic State Pension](/state-pension) to <%= format_money(calculator.lower_basic_state_pension_rate) %> per week if:
-
- - your spouse or civil partner has enough National Insurance contributions
- - your spouse or civil partner was born on or after 6 April 1950 (this rule doesn’t apply to you if you’re a woman married to a man, or if you’re a woman married to a woman who legally changed their gender from male to female after the marriage began)
-
- One of the following must also apply:
-
- - you don’t qualify for any basic State Pension
- - your basic State pension is less than <%= format_money(calculator.lower_basic_state_pension_rate) %> per week
-
- You’ll normally have got the increase when either you or your spouse or civil partner reached State Pension age, whichever was later. If you think you qualify but you’re not getting the increase, contact [The Pension Service](/contact-pension-service).
-
- ##If you become widowed or your civil partner dies
-
- You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
- - your late spouse or civil partner had enough National Insurance contributions
-
- You may also inherit a portion of their [Additional State-Pension](/additional-state-pension) and a portion of any [State Pension top up](/voluntary-national-insurance-contributions/top-up-your-state-pension). If they had [put off claiming their State Pension](/deferring-state-pension/tax-and-inheritance) you may inherit a portion of their deferral payment. You may also inherit half their Graduated Retirement Benefit (the earnings-related State Pension people could build up between 1961 and 1975).
-
- ##If you get divorced or your civil partnership is dissolved
-
- You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own [basic State Pension](/state-pension) is less than <%= format_money(calculator.higher_basic_state_pension_rate) %>
- - your former spouse or civil partner had enough National Insurance contributions
-
- The courts may award you a share of your former spouse or civil partner’s Additional State Pension as part of your settlement.
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.erb
new file mode 100644
index 00000000000..9552f0a7f74
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.erb
@@ -0,0 +1,32 @@
+<% govspeak_for :body do %>
+ ##You reached State Pension age before 6 April 2016
+
+ You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
+
+ - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+ - your former spouse or civil partner had enough National Insurance contributions
+
+ If your former spouse or civil partner reached or will reach State Pension age on or after 6 April 2016, only their National Insurance contributions up to 5 April 2016 can be used.
+
+ ^You won't have received this increase if you were divorced or your civil partnership was dissolved and you remarried or formed a new civil partnership before you reached [State Pension age](/state-pension-age).^
+
+ ##You reach State Pension age on or after 6 April 2016
+
+ You can’t increase your State Pension through your former spouse’s or civil partner’s National Insurance contributions.
+
+ The new State Pension is based on your own National Insurance record.
+
+ ##Shared additional State Pension or Protected Payment
+
+ The courts may decide to award you a share of your former spouse or civil partner’s [Additional State Pension](/additional-state-pension/further-information) if one of the following applies:
+
+ - they reached State Pension age before 6 April 2016
+ - they reached, or will reach, State Pension age on or after 6 April 2016 and divorce or dissolution proceedings began before 6 April 2016
+
+ The courts may decide to award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) if both the following apply:
+
+ - they reached, or will reach State Pension age on or after 6 April 2016
+ - divorce or dissolution proceedings began on or after 6 April 2016
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.govspeak.erb
deleted file mode 100644
index e9d2edc0973..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_due_to_divorce_outcome.govspeak.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% render_content_for :body do %>
- ##You reached State Pension age before 6 April 2016
-
- You may be able to increase your basic State Pension up to <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if:
-
- - your own basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
- - your former spouse or civil partner had enough National Insurance contributions
-
- If your former spouse or civil partner reached or will reach State Pension age on or after 6 April 2016, only their National Insurance contributions up to 5 April 2016 can be used.
-
- ^You won't have received this increase if you were divorced or your civil partnership was dissolved and you remarried or formed a new civil partnership before you reached [State Pension age](/state-pension-age).^
-
- ##You reach State Pension age on or after 6 April 2016
-
- You can’t increase your State Pension through your former spouse’s or civil partner’s National Insurance contributions.
-
- The new State Pension is based on your own National Insurance record.
-
- ##Shared additional State Pension or Protected Payment
-
- The courts may decide to award you a share of your former spouse or civil partner’s [Additional State Pension](/additional-state-pension/further-information) if one of the following applies:
-
- - they reached State Pension age before 6 April 2016
- - they reached, or will reach, State Pension age on or after 6 April 2016 and divorce or dissolution proceedings began before 6 April 2016
-
- The courts may decide to award you a share of your former spouse or civil partner’s [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner) if both the following apply:
-
- - they reached, or will reach State Pension age on or after 6 April 2016
- - divorce or dissolution proceedings began on or after 6 April 2016
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.erb
new file mode 100644
index 00000000000..c4202c3db02
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.erb
@@ -0,0 +1,36 @@
+<% govspeak_for :body do %>
+ You can’t increase your State Pension through your spouse or civil partner’s National Insurance contributions.
+
+ The [new State Pension](/new-state-pension) is based on your own National Insurance record.
+
+ ##If you become widowed
+
+ You may be able to inherit some of your spouse or civil partner’s State Pension. What you get depends on when your spouse or civil partner reached or will reach State Pension age and when your marriage or civil partnership began.
+
+ You won’t be able to inherit any of their State Pension if you remarry or form a new civil partnership before State Pension age.
+
+ ###Your spouse or civil partner reached State Pension age before 6 April 2016
+
+ You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up). You may also be able to inherit half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ You may also be able to inherit a portion of your spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage or civil partnership doesn't affect this.
+
+ ###Your spouse or civil partner reached or is due to reach State Pension age on or after 6 April 2016
+
+ You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ ###Other benefits you might get
+
+ You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if your partner dies before you reach State Pension age.
+
+ ##If you get divorced or your civil partnership is dissolved
+
+ The courts may decide to award you a share of your former partner’s Additional State Pension if they reached State Pension age before 6 April 2016. If they reached, or will reach, State Pension age after 6 April 2016, the courts may award you a share of their Protected Payment.
+
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.govspeak.erb
deleted file mode 100644
index 27368902205..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_increase_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<% render_content_for :body do %>
- You can’t increase your State Pension through your spouse or civil partner’s National Insurance contributions.
-
- The [new State Pension](/new-state-pension) is based on your own National Insurance record.
-
- ##If you become widowed
-
- You may be able to inherit some of your spouse or civil partner’s State Pension. What you get depends on when your spouse or civil partner reached or will reach State Pension age and when your marriage or civil partnership began.
-
- You won’t be able to inherit any of their State Pension if you remarry or form a new civil partnership before State Pension age.
-
- ###Your spouse or civil partner reached State Pension age before 6 April 2016
-
- You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up). You may also be able to inherit half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- You may also be able to inherit a portion of your spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage or civil partnership doesn't affect this.
-
- ###Your spouse or civil partner reached or is due to reach State Pension age on or after 6 April 2016
-
- You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- ###Other benefits you might get
-
- You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if your partner dies before you reach State Pension age.
-
- ##If you get divorced or your civil partnership is dissolved
-
- The courts may decide to award you a share of your former partner’s Additional State Pension if they reached State Pension age before 6 April 2016. If they reached, or will reach, State Pension age after 6 April 2016, the courts may award you a share of their Protected Payment.
-
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.erb
new file mode 100644
index 00000000000..58e403feb29
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.erb
@@ -0,0 +1,92 @@
+<% govspeak_for :body do %>
+ Your State Pension will normally be based on your own National Insurance contributions only.
+
+ Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
+
+ - you paid National Insurance contributions at a reduced rate
+ - you chose not to pay Class 2 contributions if you were self-employed
+
+ This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
+
+ ^Your State Pension may be higher if the reduced rate election applies to you.^
+
+ The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
+
+ $E
+
+ **Example**
+
+ You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
+
+ You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
+
+ Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
+
+ $E
+
+
+ ##What you may get if you have a reduced rate election
+
+ You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
+
+ You’ll get a pension of about <%= format_money(calculator.higher_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
+
+ <%= format_money(calculator.higher_basic_state_pension_rate) %> is the maximum rate of basic State Pension a widowed person who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
+
+ You’ll get this when you’re widowed or when you [claim your State Pension](/deferring-state-pension/tax-and-inheritance), if later.
+
+ You’ll get more if your [State Pension](/new-state-pension) is higher under your own National Insurance contributions.
+
+ ###If you remarry or form a new civil partnership before you reach State Pension age
+
+ You’ll get a pension of about <%= format_money(calculator.lower_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
+
+ You’ll get this when either you or your new spouse or civil partner reach [State Pension age](/state-pension-age), whichever is later.
+
+ If your new spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
+
+ <%= format_money(calculator.lower_basic_state_pension_rate) %> is the maximum rate of basic State Pension a married person or civil partner who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
+
+ If your [State Pension](/new-state-pension) is higher under your own National Insurance contributions, you’ll get that instead.
+
+ ##Inheriting State Pension
+
+ You may be able to inherit some of your late spouse or civil partner’s State Pension. What you get depends on when they reached or would have reached State Pension age and when your marriage or civil partnership began.
+
+ You won’t be able to inherit any of your late spouse or civil partner’s State Pension if you remarry or form a new civil partnership before you reach State Pension age.
+
+ ###Your spouse or civil partner died under State Pension age before 6 April 2016
+
+ You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
+
+ ###Your spouse or civil partner reached State Pension age before 6 April 2016
+
+ You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up).
+
+ You may also be able to inherit half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ You may also be able to inherit a portion of your late spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage doesn't affect this.
+
+ ###Your spouse or civil partner reached State Pension age or died under State Pension age on or after 6 April 2016
+
+ You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ ###If you remarry or form a new civil partnership after State Pension age
+
+ You’ll keep any State Pension you inherited from your previous spouse or civil partner if you remarry or form a new civil partnership after you reach State Pension age.
+
+ ##Other benefits you might get
+
+ You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if you haven’t yet reached State Pension age and your partner died on or after 6 April 2017.
+
+ If your spouse or civil partner died before 6 April 2017, you may be eligible for [Widowed Parent’s Allowance](/widowed-parents-allowance) or [Bereavement Allowance](/bereavement-allowance).
+
+
+
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.govspeak.erb
deleted file mode 100644
index faa1a35ee88..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,92 +0,0 @@
-<% render_content_for :body do %>
- Your State Pension will normally be based on your own National Insurance contributions only.
-
- Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
-
- - you paid National Insurance contributions at a reduced rate
- - you chose not to pay Class 2 contributions if you were self-employed
-
- This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
-
- ^Your State Pension may be higher if the reduced rate election applies to you.^
-
- The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
-
- $E
-
- **Example**
-
- You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
-
- You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
-
- Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
-
- $E
-
-
- ##What you may get if you have a reduced rate election
-
- You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
-
- You’ll get a pension of about <%= format_money(calculator.higher_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
-
- <%= format_money(calculator.higher_basic_state_pension_rate) %> is the maximum rate of basic State Pension a widowed person who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
-
- You’ll get this when you’re widowed or when you [claim your State Pension](/deferring-state-pension/tax-and-inheritance), if later.
-
- You’ll get more if your [State Pension](/new-state-pension) is higher under your own National Insurance contributions.
-
- ###If you remarry or form a new civil partnership before you reach State Pension age
-
- You’ll get a pension of about <%= format_money(calculator.lower_basic_state_pension_rate) %> a week plus any Additional State Pension and Graduated Retirement Benefit you built up before 6 April 2016.
-
- You’ll get this when either you or your new spouse or civil partner reach [State Pension age](/state-pension-age), whichever is later.
-
- If your new spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
-
- <%= format_money(calculator.lower_basic_state_pension_rate) %> is the maximum rate of basic State Pension a married person or civil partner who reached State Pension age before 6 April 2016 can get through their spouse or civil partner’s National Insurance record.
-
- If your [State Pension](/new-state-pension) is higher under your own National Insurance contributions, you’ll get that instead.
-
- ##Inheriting State Pension
-
- You may be able to inherit some of your late spouse or civil partner’s State Pension. What you get depends on when they reached or would have reached State Pension age and when your marriage or civil partnership began.
-
- You won’t be able to inherit any of your late spouse or civil partner’s State Pension if you remarry or form a new civil partnership before you reach State Pension age.
-
- ###Your spouse or civil partner died under State Pension age before 6 April 2016
-
- You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
-
- ###Your spouse or civil partner reached State Pension age before 6 April 2016
-
- You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up).
-
- You may also be able to inherit half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- You may also be able to inherit a portion of your late spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage doesn't affect this.
-
- ###Your spouse or civil partner reached State Pension age or died under State Pension age on or after 6 April 2016
-
- You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- ###If you remarry or form a new civil partnership after State Pension age
-
- You’ll keep any State Pension you inherited from your previous spouse or civil partner if you remarry or form a new civil partnership after you reach State Pension age.
-
- ##Other benefits you might get
-
- You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if you haven’t yet reached State Pension age and your partner died on or after 6 April 2017.
-
- If your spouse or civil partner died before 6 April 2017, you may be eligible for [Widowed Parent’s Allowance](/widowed-parents-allowance) or [Bereavement Allowance](/bereavement-allowance).
-
-
-
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.erb
new file mode 100644
index 00000000000..26b5238df2e
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.erb
@@ -0,0 +1,76 @@
+<% govspeak_for :body do %>
+ Your State Pension will normally be based on your own National Insurance contributions only.
+
+ Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
+
+ - you paid National Insurance contributions at a reduced rate
+ - you chose not to pay Class 2 contributions if you were self-employed
+
+ This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
+
+ ^Your State Pension may be higher if the reduced rate election applies to you.^
+
+ The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
+
+ $E
+ **Example**
+
+ You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
+
+ You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
+
+ Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
+
+ $E
+
+ ##What you may get if you have a reduced rate election
+
+ You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
+
+ You’ll get a State Pension of about:
+
+ - <%= format_money(calculator.lower_basic_state_pension_rate) %> a week if you’re married or in a civil partnership and your partner has reached State Pension age
+ - <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if you become widowed, divorced or your civil partnership is dissolved
+
+ These are the maximum rates of basic State Pension a person who reached State Pension age before 6 April 2016 could get through their spouse or civil partner’s National Insurance record.
+
+ You’ll also get any Additional State Pension and Graduated Retirement Benefit that you built up before 6 April 2016 on top of this basic amount.
+
+ This will be paid to you when:
+
+ - you or your spouse or civil partner reach State Pension age (whichever is later)
+ - you reach State Pension age (if widowed or divorced)
+ - you’re widowed, divorced or your civil partnership is dissolved after you reach State Pension age
+
+ If you’re married or in a civil partnership and your spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
+
+ If your State Pension is higher under your own National Insurance contributions, you’ll get that instead.
+
+ ##If you become widowed
+
+ You might inherit some of your spouse or civil partner’s State Pension. What you might get depends on when they reached (or would have reached) State Pension age and when your marriage or civil partnership began.
+
+ You won’t inherit any of their State Pension if you remarry or form a new civil partnership before State Pension age.
+
+ ###Your spouse or civil partner reached State Pension age before 6 April 2016
+
+ If you were married or in a civil partnership before 6 April 2016, you may inherit some of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up) and half their Graduated Retirement Benefit (the earnings-related State Pension people could build up between 1961 and 1975).
+ You may inherit some of your spouse or civil partner’s deferral payment if they [put off claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - this isn’t affected by the date of your marriage or civil partnership.
+
+ ###Your spouse or civil partner reached or is due to reach State Pension age on or after 6 April 2016
+
+ You may inherit half of their Protected Payment if you were married or in a civil partnership before 6 April 2016.
+
+ ###Other benefits you might get
+
+ You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if your partner dies before you reach State Pension age.
+
+ ##If you get divorced or your civil partnership is dissolved
+
+ The courts may award you a share of your former partner’s Additional State Pension if they reached State Pension age before 6 April 2016.
+
+ If they reached, or will reach, State Pension age after 6 April 2016, the courts may award you a share of their Protected Payment.
+
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.govspeak.erb
deleted file mode 100644
index 836ab5c50a7..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-<% render_content_for :body do %>
- Your State Pension will normally be based on your own National Insurance contributions only.
-
- Your State Pension may be worked out in a different way if 1 of the following applied before 1977:
-
- - you paid National Insurance contributions at a reduced rate
- - you chose not to pay Class 2 contributions if you were self-employed
-
- This is also known as the [married women’s reduced rate election](http://www.hmrc.gov.uk/ni/reducedrate/marriedwomen.htm) (also known as the Married Woman’s Stamp).
-
- ^Your State Pension may be higher if the reduced rate election applies to you.^
-
- The reduced rate election must have applied to you at some point within the 35 years before you reached State Pension age (not including the year you reach State Pension age). These must be tax years.
-
- $E
- **Example**
-
- You’ll reach State Pension age on 6 March 2021. This is in the tax year 6 April 2020 to 5 April 2021.
-
- You got married in 1975 and chose to pay National Insurance contributions at a reduced rate.
-
- Your State Pension will be worked out differently if your reduced rate election still applied to you in 1985.
-
- $E
-
- ##What you may get if you have a reduced rate election
-
- You won’t need to have the usual minimum of 10 qualifying years on your National Insurance record to get a State Pension.
-
- You’ll get a State Pension of about:
-
- - <%= format_money(calculator.lower_basic_state_pension_rate) %> a week if you’re married or in a civil partnership and your partner has reached State Pension age
- - <%= format_money(calculator.higher_basic_state_pension_rate) %> a week if you become widowed, divorced or your civil partnership is dissolved
-
- These are the maximum rates of basic State Pension a person who reached State Pension age before 6 April 2016 could get through their spouse or civil partner’s National Insurance record.
-
- You’ll also get any Additional State Pension and Graduated Retirement Benefit that you built up before 6 April 2016 on top of this basic amount.
-
- This will be paid to you when:
-
- - you or your spouse or civil partner reach State Pension age (whichever is later)
- - you reach State Pension age (if widowed or divorced)
- - you’re widowed, divorced or your civil partnership is dissolved after you reach State Pension age
-
- If you’re married or in a civil partnership and your spouse or civil partner reaches State Pension age after you, you’ll get your State Pension based on your own National Insurance contributions until they reach State Pension age.
-
- If your State Pension is higher under your own National Insurance contributions, you’ll get that instead.
-
- ##If you become widowed
-
- You might inherit some of your spouse or civil partner’s State Pension. What you might get depends on when they reached (or would have reached) State Pension age and when your marriage or civil partnership began.
-
- You won’t inherit any of their State Pension if you remarry or form a new civil partnership before State Pension age.
-
- ###Your spouse or civil partner reached State Pension age before 6 April 2016
-
- If you were married or in a civil partnership before 6 April 2016, you may inherit some of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up) and half their Graduated Retirement Benefit (the earnings-related State Pension people could build up between 1961 and 1975).
- You may inherit some of your spouse or civil partner’s deferral payment if they [put off claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - this isn’t affected by the date of your marriage or civil partnership.
-
- ###Your spouse or civil partner reached or is due to reach State Pension age on or after 6 April 2016
-
- You may inherit half of their Protected Payment if you were married or in a civil partnership before 6 April 2016.
-
- ###Other benefits you might get
-
- You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if your partner dies before you reach State Pension age.
-
- ##If you get divorced or your civil partnership is dissolved
-
- The courts may award you a share of your former partner’s Additional State Pension if they reached State Pension age before 6 April 2016.
-
- If they reached, or will reach, State Pension age after 6 April 2016, the courts may award you a share of their Protected Payment.
-
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.erb
new file mode 100644
index 00000000000..4d8823f6251
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.erb
@@ -0,0 +1,44 @@
+<% govspeak_for :body do %>
+ You might be able to increase the amount of basic [State Pension](/state-pension) you can get if 1 of the following apply:
+
+ - you don’t qualify for any [basic State Pension](/state-pension)
+ - your basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
+
+ Your late spouse or civil partner must also have had enough National Insurance contributions.
+
+ If they reached (or would have reached) State Pension age on or after 6 April 2016, only their National Insurance contributions to 5 April 2016 can be used to increase your basic State Pension.
+
+ You’ll get the increase when you’re widowed, or when you [claim your State Pension](/state-pension/how-to-claim), whichever is later.
+
+ ^You won’t have got this increase if you were widowed before State Pension age, and remarried or formed a new civil partnership before you reached [State Pension](/state-pension) age.^
+
+ ##Inheriting Additional State Pension and State Pension top up
+
+ You may be able to inherit a portion of your late spouse or civil partner’s [Additional State Pension](/additional-state-pension) and [State Pension top up](/voluntary-national-insurance-contributions/top-up-your-state-pension). They may have some State Pension top up if they reached State Pension age before 6 April 2016.
+
+ You’ll inherit this when you’re widowed or when you claim your State Pension, whichever is later. If you were widowed before State Pension age you may also have received it as part of [Widowed Parent’s Allowance](/widowed-parents-allowance).
+
+ ##Inheriting Graduated Retirement Benefit
+
+ You may be able to inherit half your spouse or civil partner’s Graduated Retirement Benefit (the earnings-related State Pension between 1961 and 1975).
+
+ ###When you can’t inherit Additional State Pension, State Pension top up and Graduated Retirement Benefit
+
+ You may not be able to inherit your spouse or civil partner’s Additional State Pension, State Pension top up or Graduated Retirement Benefit if all of the following apply:
+
+ - you reached State Pension age before 6 April 2010
+ - your spouse or civil partner died after you reached State Pension age but before their State Pension age
+ - you’re a man who was married or in a civil partnership, or a woman who was in a civil partnership, or a woman who was married to a woman (unless your partner legally changed gender after your marriage)
+
+ ##Inheriting a deferral payment
+
+ If your late spouse or civil partner reached State Pension age before 6 April 2016 and [put off claiming their State Pension](/deferring-state-pension), you may also inherit some of their deferral payment.
+
+ ^You can’t inherit any of your late spouse or civil partner’s State Pension if you were widowed before State Pension age and you remarried or formed a new civil partnership before State Pension age.^
+
+ ##If you remarry or form a new civil partnership
+
+ You’ll normally keep any State Pension you’re getting through your previous spouse or civil partner if you remarry or form a new civil partnership after you’ve reached State Pension age. But if you’d get more State Pension through your new spouse or civil partner, you’ll get that instead.
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.govspeak.erb
deleted file mode 100644
index 4705b5e83f7..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.govspeak.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<% render_content_for :body do %>
- You might be able to increase the amount of basic [State Pension](/state-pension) you can get if 1 of the following apply:
-
- - you don’t qualify for any [basic State Pension](/state-pension)
- - your basic State Pension is less than <%= format_money(calculator.higher_basic_state_pension_rate) %> a week
-
- Your late spouse or civil partner must also have had enough National Insurance contributions.
-
- If they reached (or would have reached) State Pension age on or after 6 April 2016, only their National Insurance contributions to 5 April 2016 can be used to increase your basic State Pension.
-
- You’ll get the increase when you’re widowed, or when you [claim your State Pension](/state-pension/how-to-claim), whichever is later.
-
- ^You won’t have got this increase if you were widowed before State Pension age, and remarried or formed a new civil partnership before you reached [State Pension](/state-pension) age.^
-
- ##Inheriting Additional State Pension and State Pension top up
-
- You may be able to inherit a portion of your late spouse or civil partner’s [Additional State Pension](/additional-state-pension) and [State Pension top up](/voluntary-national-insurance-contributions/top-up-your-state-pension). They may have some State Pension top up if they reached State Pension age before 6 April 2016.
-
- You’ll inherit this when you’re widowed or when you claim your State Pension, whichever is later. If you were widowed before State Pension age you may also have received it as part of [Widowed Parent’s Allowance](/widowed-parents-allowance).
-
- ##Inheriting Graduated Retirement Benefit
-
- You may be able to inherit half your spouse or civil partner’s Graduated Retirement Benefit (the earnings-related State Pension between 1961 and 1975).
-
- ###When you can’t inherit Additional State Pension, State Pension top up and Graduated Retirement Benefit
-
- You may not be able to inherit your spouse or civil partner’s Additional State Pension, State Pension top up or Graduated Retirement Benefit if all of the following apply:
-
- - you reached State Pension age before 6 April 2010
- - your spouse or civil partner died after you reached State Pension age but before their State Pension age
- - you’re a man who was married or in a civil partnership, or a woman who was in a civil partnership, or a woman who was married to a woman (unless your partner legally changed gender after your marriage)
-
- ##Inheriting a deferral payment
-
- If your late spouse or civil partner reached State Pension age before 6 April 2016 and [put off claiming their State Pension](/deferring-state-pension), you may also inherit some of their deferral payment.
-
- ^You can’t inherit any of your late spouse or civil partner’s State Pension if you were widowed before State Pension age and you remarried or formed a new civil partnership before State Pension age.^
-
- ##If you remarry or form a new civil partnership
-
- You’ll normally keep any State Pension you’re getting through your previous spouse or civil partner if you remarry or form a new civil partnership after you’ve reached State Pension age. But if you’d get more State Pension through your new spouse or civil partner, you’ll get that instead.
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.erb
new file mode 100644
index 00000000000..cb4235a500d
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.erb
@@ -0,0 +1,41 @@
+<% govspeak_for :body do %>
+ You can’t increase your State Pension through your spouse or civil partner’s National Insurance contributions.
+
+ The new [State Pension](/new-state-pension) is based on your own National Insurance record.
+
+ ##Inheriting State Pension
+
+ You may be able to inherit some of your late spouse or civil partner’s State Pension. What you get depends on when they reached or would have reached State Pension age and when your marriage or civil partnership began.
+
+ You won’t be able to inherit any of your late spouse or civil partner’s State Pension if you remarry or form a new civil partnership before you reach State Pension age.
+
+ ###Your spouse or civil partner died under State Pension age before 6 April 2016
+
+ You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
+
+ ###Your spouse or civil partner reached State Pension age before 6 April 2016
+
+ You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ You may also be able to inherit a portion of your late spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage doesn't affect this.
+
+ ###Your spouse or civil partner reached State Pension age or died under State Pension age on or after 6 April 2016
+
+ You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
+
+ You must have been married or in a civil partnership with your partner before 6 April 2016.
+
+ ###If you remarry or form a new civil partnership after State Pension age
+
+ You’ll keep any State Pension you inherited from your previous spouse or civil partner if you remarry or form a new civil partnership after you’ve reached State Pension age.
+
+ ##Other benefits you might get
+You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if you haven’t yet reached State Pension age and your partner died on or after 6 April 2017.
+
+If your spouse or civil partner died before 6 April 2017, you may be eligible for [Widowed Parent’s Allowance](/widowed-parents-allowance) or [Bereavement Allowance](/bereavement-allowance).
+
+
+ <%= render partial: 'increase_retirement_income' %>
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.govspeak.erb
deleted file mode 100644
index 0955ceafcd4..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_male_reaching_pension_age.govspeak.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% render_content_for :body do %>
- You can’t increase your State Pension through your spouse or civil partner’s National Insurance contributions.
-
- The new [State Pension](/new-state-pension) is based on your own National Insurance record.
-
- ##Inheriting State Pension
-
- You may be able to inherit some of your late spouse or civil partner’s State Pension. What you get depends on when they reached or would have reached State Pension age and when your marriage or civil partnership began.
-
- You won’t be able to inherit any of your late spouse or civil partner’s State Pension if you remarry or form a new civil partnership before you reach State Pension age.
-
- ###Your spouse or civil partner died under State Pension age before 6 April 2016
-
- You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
-
- ###Your spouse or civil partner reached State Pension age before 6 April 2016
-
- You may be able to inherit a portion of their [Additional State Pension](/additional-state-pension/further-information) and [State Pension top up](/state-pension-top-up) and half their Graduated Retirement Benefit. This was the earnings-related State Pension people could build up between 1961 and 1975.
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- You may also be able to inherit a portion of your late spouse or civil partner’s deferral payment if they had [deferred claiming their State Pension](/deferring-state-pension/tax-and-inheritance) - the date of your marriage doesn't affect this.
-
- ###Your spouse or civil partner reached State Pension age or died under State Pension age on or after 6 April 2016
-
- You may be able to inherit half of their [Protected Payment](/new-state-pension/inheriting-or-increasing-state-pension-from-a-spouse-or-civil-partner).
-
- You must have been married or in a civil partnership with your partner before 6 April 2016.
-
- ###If you remarry or form a new civil partnership after State Pension age
-
- You’ll keep any State Pension you inherited from your previous spouse or civil partner if you remarry or form a new civil partnership after you’ve reached State Pension age.
-
- ##Other benefits you might get
-You might be eligible for a [Bereavement Support Payment](/bereavement-support-payment) if you haven’t yet reached State Pension age and your partner died on or after 6 April 2017.
-
-If your spouse or civil partner died before 6 April 2017, you may be eligible for [Widowed Parent’s Allowance](/widowed-parents-allowance) or [Bereavement Allowance](/bereavement-allowance).
-
-
- <%= render partial: 'increase_retirement_income.govspeak.erb' %>
-<% 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
new file mode 100644
index 00000000000..ec0db3402e2
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you:
+<% end %>
+
+<% options(
+ "male_gender": "a man",
+ "female_gender": "a woman"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.govspeak.erb
deleted file mode 100644
index 6bf81c3c766..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you:
-<% end %>
-
-<% options(
- "male_gender": "a man",
- "female_gender": "a woman"
-) %>
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
new file mode 100644
index 00000000000..2d567caab81
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ What is your marital status?
+<% end %>
+
+<% options(
+ "married": "married or in a civil partnership",
+ "widowed": "widowed",
+ "divorced": "divorced or have dissolved your civil partnership"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.govspeak.erb
deleted file mode 100644
index 8b9d5214d20..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- What is your marital status?
-<% end %>
-
-<% options(
- "married": "married or in a civil partnership",
- "widowed": "widowed",
- "divorced": "divorced or have dissolved your civil partnership"
-) %>
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
new file mode 100644
index 00000000000..30aa347974c
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When will (or did) you reach state pension age?
+<% end %>
+
+<% options(
+ "your_pension_age_before_specific_date": "on or before 5 April 2016",
+ "your_pension_age_after_specific_date": "on or after 6 April 2016"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.govspeak.erb
deleted file mode 100644
index c27b977623a..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When will (or did) you reach state pension age?
-<% end %>
-
-<% options(
- "your_pension_age_before_specific_date": "on or before 5 April 2016",
- "your_pension_age_after_specific_date": "on or after 6 April 2016"
-) %>
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
new file mode 100644
index 00000000000..d28d8e97d30
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When will (or did) your spouse or civil partner reach state pension age?
+<% end %>
+
+<% options(
+ "partner_pension_age_before_specific_date": "on or before 5 April 2016",
+ "partner_pension_age_after_specific_date": "on or after 6 April 2016"
+) %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.govspeak.erb
deleted file mode 100644
index 0a13f7b1c02..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When will (or did) your spouse or civil partner reach state pension age?
-<% end %>
-
-<% options(
- "partner_pension_age_before_specific_date": "on or before 5 April 2016",
- "partner_pension_age_after_specific_date": "on or after 6 April 2016"
-) %>
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
new file mode 100644
index 00000000000..d00924f2874
--- /dev/null
+++ b/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.erb
@@ -0,0 +1,18 @@
+<% text_for :title do %>
+ Your partner’s National Insurance record and your State Pension
+<% end %>
+
+<% text_for :meta_description do %>
+ You may be able to increase your State Pension based on the National Insurance record
+<% end %>
+
+<% govspeak_for :body do %>
+ People who reach [State Pension age](/state-pension-age) on or after 6 April 2016 will claim the new State Pension.
+
+ People who reached State Pension age before 6 April 2016 will continue to get their State Pension under the old State Pension system (which includes [basic State Pension](/state-pension) and [Additional State Pension](/additional-state-pension) and Graduated Retirement Benefit).
+
+ The rules for how you can increase your State Pension and what you can inherit will be different depending on when you and your spouse or civil partner reach [State Pension age](/state-pension-age).
+
+
+ You’ll need to know when both you and your spouse or civil partner reach State Pension age to use this tool.
+<% end %>
diff --git a/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.govspeak.erb b/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.govspeak.erb
deleted file mode 100644
index 9b2ee17a6f7..00000000000
--- a/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :title do %>
- Your partner’s National Insurance record and your State Pension
-<% end %>
-
-<% render_content_for :meta_description do %>
- You may be able to increase your State Pension based on the National Insurance record
-<% end %>
-
-<% render_content_for :body do %>
- People who reach [State Pension age](/state-pension-age) on or after 6 April 2016 will claim the new State Pension.
-
- People who reached State Pension age before 6 April 2016 will continue to get their State Pension under the old State Pension system (which includes [basic State Pension](/state-pension) and [Additional State Pension](/additional-state-pension) and Graduated Retirement Benefit).
-
- The rules for how you can increase your State Pension and what you can inherit will be different depending on when you and your spouse or civil partner reach [State Pension age](/state-pension-age).
-
-
- You’ll need to know when both you and your spouse or civil partner reach State Pension age to use this tool.
-<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_disclaimer.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_disclaimer.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_disclaimer.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_disclaimer.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_full_time_tuition.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_full_time_tuition.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_full_time_tuition.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_full_time_tuition.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_next_steps.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_next_steps.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_next_steps.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_next_steps.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_full_time_funding.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_full_time_funding.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_full_time_funding.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_full_time_funding.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_part_time_funding.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_part_time_funding.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_part_time_funding.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_nhs_part_time_funding.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/_uk_extra_help.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/_uk_extra_help.erb
similarity index 100%
rename from lib/smart_answer_flows/student-finance-calculator/outcomes/_uk_extra_help.govspeak.erb
rename to lib/smart_answer_flows/student-finance-calculator/outcomes/_uk_extra_help.erb
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.erb
new file mode 100644
index 00000000000..042051b2e7f
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.erb
@@ -0,0 +1,28 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'disclaimer' %>
+
+ ##Tuition costs
+
+ You could get a [Tuition Fee Loan](/student-finance/eu-students) - <%= format_money(tuition_fee_amount, pounds_only: true) %> per year.
+
+ The loan pays for the cost of your course and must be paid back.
+
+ <% if course_type == 'eu-full-time' %>
+ ##Living costs
+
+ Most EU full-time students don't qualify for help with living costs (known as 'maintenance').
+ <% else %>
+ ##Living costs
+
+ EU part-time students don't qualify for help with living costs (known as 'maintenance').
+ <% end %>
+
+ ##Extra help
+
+ You could get a [bursary or scholarship](/extra-money-pay-university) from your university or college. Usually, this doesn't have to be paid back.
+
+ Use the [Turn2us grant search](http://grants-search.turn2us.org.uk/) to check whether you qualify for funding from a charitable trust.
+
+ <%= render partial: 'next_steps' %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.govspeak.erb
deleted file mode 100644
index aee5dd0a3f2..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_eu_students.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'disclaimer.govspeak.erb' %>
-
- ##Tuition costs
-
- You could get a [Tuition Fee Loan](/student-finance/eu-students) - <%= format_money(tuition_fee_amount, pounds_only: true) %> per year.
-
- The loan pays for the cost of your course and must be paid back.
-
- <% if course_type == 'eu-full-time' %>
- ##Living costs
-
- Most EU full-time students don't qualify for help with living costs (known as 'maintenance').
- <% else %>
- ##Living costs
-
- EU part-time students don't qualify for help with living costs (known as 'maintenance').
- <% end %>
-
- ##Extra help
-
- You could get a [bursary or scholarship](/extra-money-pay-university) from your university or college. Usually, this doesn't have to be paid back.
-
- Use the [Turn2us grant search](http://grants-search.turn2us.org.uk/) to check whether you qualify for funding from a charitable trust.
-
- <%= render partial: 'next_steps.govspeak.erb' %>
-
-<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.erb
new file mode 100644
index 00000000000..a9edfb7db28
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.erb
@@ -0,0 +1,55 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'disclaimer' %>
+
+ <% if course_studied == 'dental-medical-healthcare' %>
+ To qualify for a Maintenance Loan you must be studying a DipHE in dental hygiene and dental therapy or operating department practice, or a Foundation Degree in dental hygiene and dental therapy.
+ <% elsif course_studied == 'teacher-training' %>
+ To qualify for a Maintenance Loan you must be studying an Initial Teacher Training course (if it's degree level or above).
+ <% elsif course_studied == 'none-of-the-above' %>
+ To qualify for a Maintenance Loan, you must be studying one of the following courses:
+
+ - a first degree, for example BA, BSc or BEd
+ - a Foundation Degree in dental hygiene and dental therapy
+ - DipHe in dental hygiene and dental therapy or operating department practice
+ - an integrated master's degree
+ - a Graduate Certificate or Graduate Diploma
+ <% end %>
+
+ ##Student finance
+
+ You could get per year:
+
+ - <%= format_money(tuition_fee_amount, pounds_only: true) %> [Tuition Fee Loan](/student-finance/parttime-students)
+
+ <% if calculator.maintenance_loan_amount > 0 %>
+ - <%= format_money(calculator.maintenance_loan_amount, pounds_only: true) %> [Maintenance Loan](/student-finance/parttime-students)
+ <% end %>
+
+ ###Extra student funding
+
+ <% if all_uk_students_circumstances.include?('no') and course_studied != 'teacher-training' and course_studied != 'social-work' %>
+ You don’t qualify for extra grants and allowances.
+ <% else %>
+ You could get:
+
+ <% if all_uk_students_circumstances.include?('has-disability') %>
+ - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
+ <% end %>
+
+ <% if all_uk_students_circumstances.include?('low-income') %>
+ - [University and college hardship funds](/extra-money-pay-university/university-and-college-hardship-funds) (extra help with costs while studying)
+ <% end %>
+
+ <% if course_studied == 'teacher-training' %>
+ - [Funding for teacher training](/teacher-training-funding)
+ <% elsif course_studied == 'social-work' %>
+ - [Social Work Bursary](/social-work-bursaries) (NHS funding towards your fees and living costs)
+ <% end %>
+
+ <% end %>
+
+ <%= render partial: 'uk_extra_help', locals: { course_type: course_type } %>
+
+ <%= render partial: 'next_steps' %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.govspeak.erb
deleted file mode 100644
index b79c841e558..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_all_students.govspeak.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'disclaimer.govspeak.erb' %>
-
- <% if course_studied == 'dental-medical-healthcare' %>
- To qualify for a Maintenance Loan you must be studying a DipHE in dental hygiene and dental therapy or operating department practice, or a Foundation Degree in dental hygiene and dental therapy.
- <% elsif course_studied == 'teacher-training' %>
- To qualify for a Maintenance Loan you must be studying an Initial Teacher Training course (if it's degree level or above).
- <% elsif course_studied == 'none-of-the-above' %>
- To qualify for a Maintenance Loan, you must be studying one of the following courses:
-
- - a first degree, for example BA, BSc or BEd
- - a Foundation Degree in dental hygiene and dental therapy
- - DipHe in dental hygiene and dental therapy or operating department practice
- - an integrated master's degree
- - a Graduate Certificate or Graduate Diploma
- <% end %>
-
- ##Student finance
-
- You could get per year:
-
- - <%= format_money(tuition_fee_amount, pounds_only: true) %> [Tuition Fee Loan](/student-finance/parttime-students)
-
- <% if calculator.maintenance_loan_amount > 0 %>
- - <%= format_money(calculator.maintenance_loan_amount, pounds_only: true) %> [Maintenance Loan](/student-finance/parttime-students)
- <% end %>
-
- ###Extra student funding
-
- <% if all_uk_students_circumstances.include?('no') and course_studied != 'teacher-training' and course_studied != 'social-work' %>
- You don’t qualify for extra grants and allowances.
- <% else %>
- You could get:
-
- <% if all_uk_students_circumstances.include?('has-disability') %>
- - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
- <% end %>
-
- <% if all_uk_students_circumstances.include?('low-income') %>
- - [University and college hardship funds](/extra-money-pay-university/university-and-college-hardship-funds) (extra help with costs while studying)
- <% end %>
-
- <% if course_studied == 'teacher-training' %>
- - [Funding for teacher training](/teacher-training-funding)
- <% elsif course_studied == 'social-work' %>
- - [Social Work Bursary](/social-work-bursaries) (NHS funding towards your fees and living costs)
- <% end %>
-
- <% end %>
-
- <%= render partial: 'uk_extra_help.govspeak.erb', locals: { course_type: course_type } %>
-
- <%= render partial: 'next_steps.govspeak.erb' %>
-
-<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.erb
new file mode 100644
index 00000000000..60513ded556
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.erb
@@ -0,0 +1,38 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'disclaimer' %>
+ ##If you’re studying to become a doctor or dentist
+
+ The amount you get will change during your course.
+
+ In each of your first 4 years, you could get:
+
+ <%= render partial: 'full_time_tuition', locals: { tuition_fee_amount: tuition_fee_amount, maintenance_loan_amount: calculator.maintenance_loan_amount, maintenance_grant_amount: calculator.maintenance_grant_amount, start_date: start_date } %>
+
+ <% if calculator.eligible_for_childcare_grant_one_child? %>
+ - up to 85% of your childcare costs (maximum <%= format_money(calculator.childcare_grant_one_child) %> a week for a single child or <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week if you have more than one) in Childcare Grant
+ <% elsif calculator.eligible_for_childcare_grant_more_than_one_child? %>
+ - up to 85% of your childcare costs to a maximum <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week in Childcare Grant if you have 2 or more children
+ <% end %>
+
+ <% if calculator.eligible_for_parent_learning_allowance? %>
+ - up to <%= format_money(calculator.parent_learning_allowance) %> per year [Parents’ Learning Allowance](/parents-learning-allowance)
+ <% end %>
+
+ <% if calculator.eligible_for_adult_dependant_allowance? %>
+ - up to <%= format_money(calculator.adult_dependant_allowance) %> per year [Adult Dependant’s Grant](/adult-dependants-grant)
+ <% end %>
+
+ <% if uk_ft_circumstances.include?('has-disability') %>
+ - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
+ <% end %>
+
+ In your fifth and sixth years, you could get <%= format_money(calculator.reduced_maintenance_loan_for_healthcare, pounds_only: true) %> reduced Maintenance Loan. You can also apply for [NHS funding](/nhs-bursaries) and get the following depending on your circumstances:
+
+ <%= render partial: 'nhs_full_time_funding', locals: { uk_ft_circumstances: uk_ft_circumstances, calculator: calculator } %>
+
+ ^ If you're on a 4 year accelerated graduate course, you'll have to apply for an NHS bursary from your second year.
+
+ <%= render partial: 'uk_extra_help', locals: { course_type: course_type } %>
+
+ <%= render partial: 'next_steps' %>
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.govspeak.erb
deleted file mode 100644
index 3935c602caf..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_dental_medical_students.govspeak.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'disclaimer.govspeak.erb' %>
- ##If you’re studying to become a doctor or dentist
-
- The amount you get will change during your course.
-
- In each of your first 4 years, you could get:
-
- <%= render partial: 'full_time_tuition.govspeak.erb', locals: { tuition_fee_amount: tuition_fee_amount, maintenance_loan_amount: calculator.maintenance_loan_amount, maintenance_grant_amount: calculator.maintenance_grant_amount, start_date: start_date } %>
-
- <% if calculator.eligible_for_childcare_grant_one_child? %>
- - up to 85% of your childcare costs (maximum <%= format_money(calculator.childcare_grant_one_child) %> a week for a single child or <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week if you have more than one) in Childcare Grant
- <% elsif calculator.eligible_for_childcare_grant_more_than_one_child? %>
- - up to 85% of your childcare costs to a maximum <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week in Childcare Grant if you have 2 or more children
- <% end %>
-
- <% if calculator.eligible_for_parent_learning_allowance? %>
- - up to <%= format_money(calculator.parent_learning_allowance) %> per year [Parents’ Learning Allowance](/parents-learning-allowance)
- <% end %>
-
- <% if calculator.eligible_for_adult_dependant_allowance? %>
- - up to <%= format_money(calculator.adult_dependant_allowance) %> per year [Adult Dependant’s Grant](/adult-dependants-grant)
- <% end %>
-
- <% if uk_ft_circumstances.include?('has-disability') %>
- - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
- <% end %>
-
- In your fifth and sixth years, you could get <%= format_money(calculator.reduced_maintenance_loan_for_healthcare, pounds_only: true) %> reduced Maintenance Loan. You can also apply for [NHS funding](/nhs-bursaries) and get the following depending on your circumstances:
-
- <%= render partial: 'nhs_full_time_funding.govspeak.erb', locals: { uk_ft_circumstances: uk_ft_circumstances, calculator: calculator } %>
-
- ^ If you're on a 4 year accelerated graduate course, you'll have to apply for an NHS bursary from your second year.
-
- <%= render partial: 'uk_extra_help.govspeak.erb', locals: { course_type: course_type } %>
-
- <%= render partial: 'next_steps.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.erb
new file mode 100644
index 00000000000..23a524be6ac
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.erb
@@ -0,0 +1,53 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'disclaimer' %>
+
+ ##Student finance
+
+ You could get per year:
+
+ <%= render partial: 'full_time_tuition', locals: { tuition_fee_amount: tuition_fee_amount, maintenance_loan_amount: calculator.maintenance_loan_amount, maintenance_grant_amount: calculator.maintenance_grant_amount, start_date: start_date } %>
+
+ ###Extra student funding
+
+ <% if uk_ft_circumstances.include?('no') && course_studied == 'none-of-the-above' %>
+ You don’t qualify for extra grants and allowances.
+ <% else %>
+ Depending on your income and circumstances, you could get:
+
+ <% if calculator.eligible_for_childcare_grant_one_child? %>
+ - up to 85% of your childcare costs (maximum <%= format_money(calculator.childcare_grant_one_child) %> a week for a single child or <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week if you have more than one) in Childcare Grant
+ <% elsif calculator.eligible_for_childcare_grant_more_than_one_child? %>
+ - up to 85% of your childcare costs to a maximum <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week in Childcare Grant if you have 2 or more children
+ <% end %>
+
+ <% if calculator.eligible_for_parent_learning_allowance? %>
+ - up to <%= format_money(calculator.parent_learning_allowance) %> per year [Parents’ Learning Allowance](/parents-learning-allowance)
+ <% end %>
+
+ <% if uk_ft_circumstances.include?('children-under-17') %>
+ - [Child Tax Credit](/child-tax-credit)
+ <% end %>
+
+ <% if calculator.eligible_for_adult_dependant_allowance? %>
+ - up to <%= format_money(calculator.adult_dependant_allowance) %> per year [Adult Dependant’s Grant](/adult-dependants-grant)
+ <% end %>
+
+ <% if uk_ft_circumstances.include?('has-disability') %>
+ - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
+ <% end %>
+
+ <% if uk_ft_circumstances.include?('low-income') %>
+ - [University and college hardship funds](/extra-money-pay-university/university-and-college-hardship-funds) (extra help with costs while studying)
+ <% end %>
+
+ <% if course_studied == 'teacher-training' %>
+ - [Funding for teacher training](/teacher-training-funding)
+ <% elsif course_studied == 'social-work' %>
+ - [Social Work Bursary](/social-work-bursaries) (NHS funding towards your fees and living costs)
+ <% end %>
+
+ <%= render partial: 'uk_extra_help', locals: { course_type: course_type } %>
+
+ <%= render partial: 'next_steps' %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.govspeak.erb
deleted file mode 100644
index a2658a18c48..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_full_time_students.govspeak.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'disclaimer.govspeak.erb' %>
-
- ##Student finance
-
- You could get per year:
-
- <%= render partial: 'full_time_tuition.govspeak.erb', locals: { tuition_fee_amount: tuition_fee_amount, maintenance_loan_amount: calculator.maintenance_loan_amount, maintenance_grant_amount: calculator.maintenance_grant_amount, start_date: start_date } %>
-
- ###Extra student funding
-
- <% if uk_ft_circumstances.include?('no') && course_studied == 'none-of-the-above' %>
- You don’t qualify for extra grants and allowances.
- <% else %>
- Depending on your income and circumstances, you could get:
-
- <% if calculator.eligible_for_childcare_grant_one_child? %>
- - up to 85% of your childcare costs (maximum <%= format_money(calculator.childcare_grant_one_child) %> a week for a single child or <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week if you have more than one) in Childcare Grant
- <% elsif calculator.eligible_for_childcare_grant_more_than_one_child? %>
- - up to 85% of your childcare costs to a maximum <%= format_money(calculator.childcare_grant_more_than_one_child) %> a week in Childcare Grant if you have 2 or more children
- <% end %>
-
- <% if calculator.eligible_for_parent_learning_allowance? %>
- - up to <%= format_money(calculator.parent_learning_allowance) %> per year [Parents’ Learning Allowance](/parents-learning-allowance)
- <% end %>
-
- <% if uk_ft_circumstances.include?('children-under-17') %>
- - [Child Tax Credit](/child-tax-credit)
- <% end %>
-
- <% if calculator.eligible_for_adult_dependant_allowance? %>
- - up to <%= format_money(calculator.adult_dependant_allowance) %> per year [Adult Dependant’s Grant](/adult-dependants-grant)
- <% end %>
-
- <% if uk_ft_circumstances.include?('has-disability') %>
- - [Disabled Students' Allowances](/disabled-students-allowances-dsas)
- <% end %>
-
- <% if uk_ft_circumstances.include?('low-income') %>
- - [University and college hardship funds](/extra-money-pay-university/university-and-college-hardship-funds) (extra help with costs while studying)
- <% end %>
-
- <% if course_studied == 'teacher-training' %>
- - [Funding for teacher training](/teacher-training-funding)
- <% elsif course_studied == 'social-work' %>
- - [Social Work Bursary](/social-work-bursaries) (NHS funding towards your fees and living costs)
- <% end %>
-
- <%= render partial: 'uk_extra_help.govspeak.erb', locals: { course_type: course_type } %>
-
- <%= render partial: 'next_steps.govspeak.erb' %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.erb
new file mode 100644
index 00000000000..1ddc180724f
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.erb
@@ -0,0 +1,12 @@
+<% govspeak_for :body do %>
+ <%= render partial: 'disclaimer' %>
+
+ Each year you could get the following [NHS funding](/nhs-bursaries):
+
+ <%= render partial: 'nhs_part_time_funding', locals: { all_uk_students_circumstances: all_uk_students_circumstances, calculator: calculator } %>
+
+ <%= render partial: 'uk_extra_help', locals: { course_type: course_type } %>
+
+ <%= render partial: 'next_steps' %>
+
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.govspeak.erb
deleted file mode 100644
index f8386a1d024..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/outcomes/outcome_uk_part_time_dental_medical_students.govspeak.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% render_content_for :body do %>
- <%= render partial: 'disclaimer.govspeak.erb' %>
-
- Each year you could get the following [NHS funding](/nhs-bursaries):
-
- <%= render partial: 'nhs_part_time_funding.govspeak.erb', locals: { all_uk_students_circumstances: all_uk_students_circumstances, calculator: calculator } %>
-
- <%= render partial: 'uk_extra_help.govspeak.erb', locals: { course_type: course_type } %>
-
- <%= render partial: 'next_steps.govspeak.erb' %>
-
-<% 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
new file mode 100644
index 00000000000..4de6fa538b8
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you studying to be a doctor or dentist?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.govspeak.erb
deleted file mode 100644
index 835ad470309..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you studying to be a doctor or dentist?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..2f694c2be4b
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you studying dental hygiene or dental therapy?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.govspeak.erb
deleted file mode 100644
index 970cedc0caa..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you studying dental hygiene or dental therapy?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..9ac6310bff9
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Are you studying one of these courses?
+<% end %>
+
+<% options(
+ "doctor-or-dentist": "Doctor or dentist",
+ "dental-hygiene-or-dental-therapy": "Dental hygiene or dental therapy",
+ "none-of-the-above": " None of these"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.govspeak.erb
deleted file mode 100644
index 610560d6581..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Are you studying one of these courses?
-<% end %>
-
-<% options(
- "doctor-or-dentist": "Doctor or dentist",
- "dental-hygiene-or-dental-therapy": "Dental hygiene or dental therapy",
- "none-of-the-above": " None of these"
-) %>
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
new file mode 100644
index 00000000000..cf0df63fb96
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Do any of the following apply? (You might get extra funding.)
+<% end %>
+
+<% options(
+ "has-disability": "You have a disability, health condition or learning difficulty, for example dyslexia",
+ "low-income": "You’re on a low income, for example you find it hard to pay for food and accommodation",
+ "no": "None of these"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.govspeak.erb
deleted file mode 100644
index 97eefea2abe..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Do any of the following apply? (You might get extra funding.)
-<% end %>
-
-<% options(
- "has-disability": "You have a disability, health condition or learning difficulty, for example dyslexia",
- "low-income": "You’re on a low income, for example you find it hard to pay for food and accommodation",
- "no": "None of these"
-) %>
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
new file mode 100644
index 00000000000..b8c5d559ea2
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Do any of the following apply? (You might get extra funding.)
+<% end %>
+
+<% options(
+ "children-under-17": "You’ve got children under 17",
+ "dependant-adult": "An adult depends on you financially",
+ "has-disability": "You have a disability, health condition or learning difficulty, for example dyslexia",
+ "low-income": "You’re on low income, for example you find it hard to pay for basics like food and accommodation",
+ "no": "None of these"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.govspeak.erb
deleted file mode 100644
index 61cec88ebe0..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Do any of the following apply? (You might get extra funding.)
-<% end %>
-
-<% options(
- "children-under-17": "You’ve got children under 17",
- "dependant-adult": "An adult depends on you financially",
- "has-disability": "You have a disability, health condition or learning difficulty, for example dyslexia",
- "low-income": "You’re on low income, for example you find it hard to pay for basics like food and accommodation",
- "no": "None of these"
-) %>
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
new file mode 100644
index 00000000000..19ff556aeb7
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How many credits a year does a full-time student study?
+<% end %>
+
+<% text_for :hint do %>
+ Ask your university or college if you're not sure.
+<% end %>
+
+<% 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_does_a_full_time_student_study.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.govspeak.erb
deleted file mode 100644
index 1d63c8c919c..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How many credits a year does a full-time student study?
-<% end %>
-
-<% render_content_for :hint do %>
- Ask your university or college if you're not sure.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..15af2be51f4
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.erb
@@ -0,0 +1,11 @@
+<% 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 %>
+
+<% text_for :hint do %>
+ Ask your university or college if you're not sure.
+<% end %>
+
+<% 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_many_credits_will_you_study.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.govspeak.erb
deleted file mode 100644
index 7529ad2cb06..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_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 %>
- Ask your university or college if you're not sure.
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..a863de5c9e4
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ How much are your tuition fees per year?
+<% end %>
+
+<% 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 %>
+
+<% 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/how_much_are_your_tuition_fees_per_year.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.govspeak.erb
deleted file mode 100644
index 4908c029b9f..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- How much are your tuition fees per year?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..991615595aa
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Are you studying one of these courses?
+<% end %>
+
+<% options(
+ "teacher-training": "Teacher training",
+ "dental-medical-healthcare": "Dental, medical or healthcare",
+ "social-work": "Social work",
+ "none-of-the-above": " None of these"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.govspeak.erb
deleted file mode 100644
index 8d962ab8c18..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Are you studying one of these courses?
-<% end %>
-
-<% options(
- "teacher-training": "Teacher training",
- "dental-medical-healthcare": "Dental, medical or healthcare",
- "social-work": "Social work",
- "none-of-the-above": " None of these"
-) %>
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
new file mode 100644
index 00000000000..202329216e8
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ What type of student are you?
+<% end %>
+
+<% options(
+ "uk-full-time": "UK student full-time",
+ "uk-part-time": "UK student part-time",
+ "eu-full-time": "EU student full-time",
+ "eu-part-time": "EU student part-time"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.govspeak.erb
deleted file mode 100644
index 9b642550fdf..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- What type of student are you?
-<% end %>
-
-<% options(
- "uk-full-time": "UK student full-time",
- "uk-part-time": "UK student part-time",
- "eu-full-time": "EU student full-time",
- "eu-part-time": "EU student part-time"
-) %>
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
new file mode 100644
index 00000000000..3dee7df700c
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What's your annual household income?
+<% end %>
+
+<% 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 %>
+
+<% 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/whats_your_household_income.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.govspeak.erb
deleted file mode 100644
index 4c45484bd38..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What's your annual household income?
-<% end %>
-
-<% render_content_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 %>
- 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
new file mode 100644
index 00000000000..59b880f4f00
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When does your course start?
+<% end %>
+
+<% options(
+ "2019-2020": "Between September 2019 and August 2020",
+ "2020-2021": "Between September 2020 and August 2021",
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.govspeak.erb
deleted file mode 100644
index 1c2219ac716..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When does your course start?
-<% end %>
-
-<% options(
- "2019-2020": "Between September 2019 and August 2020",
- "2020-2021": "Between September 2020 and August 2021",
-) %>
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
new file mode 100644
index 00000000000..50e783c2013
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ Where will you live while studying?
+<% end %>
+
+<% options(
+ "at-home": "Living with parents",
+ "away-outside-london": "Not living with parents and studying outside London",
+ "away-in-london": "Not living with parents and studying in London"
+) %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.govspeak.erb
deleted file mode 100644
index ce92c1de143..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- Where will you live while studying?
-<% end %>
-
-<% options(
- "at-home": "Living with parents",
- "away-outside-london": "Not living with parents and studying outside London",
- "away-in-london": "Not living with parents and studying in London"
-) %>
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
new file mode 100644
index 00000000000..c6901dafb8f
--- /dev/null
+++ b/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.erb
@@ -0,0 +1,27 @@
+<% text_for :title do %>
+ Student finance calculator
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ This calculator is for students from England or the European Union (EU) starting a new undergraduate course in academic years:
+
+ + 2019 to 2020
+ + 2020 to 2021
+
+ Use the student finance calculator to estimate:
+
+ + student loans
+ + extra student funding, for example if you’re disabled or have children
+
+ Your result will be more accurate if you know your annual household income (your parents’ or partner’s income plus your own).
+<% end %>
+
+<% govspeak_for :post_body do %>
+ If you’re a part-time student you’ll need to know how many credits you’ll study and how many credits a full-time student would study.
+
+ You cannot use the calculator if you’re from [Scotland](http://www.saas.gov.uk/), [Wales](http://www.studentfinancewales.co.uk) or [Northern Ireland.](http://www.studentfinanceni.co.uk)
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.govspeak.erb b/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.govspeak.erb
deleted file mode 100644
index b9add5590de..00000000000
--- a/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :title do %>
- Student finance calculator
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- This calculator is for students from England or the European Union (EU) starting a new undergraduate course in academic years:
-
- + 2019 to 2020
- + 2020 to 2021
-
- Use the student finance calculator to estimate:
-
- + student loans
- + extra student funding, for example if you’re disabled or have children
-
- Your result will be more accurate if you know your annual household income (your parents’ or partner’s income plus your own).
-<% end %>
-
-<% render_content_for :post_body do %>
- If you’re a part-time student you’ll need to know how many credits you’ll study and how many credits a full-time student would study.
-
- You cannot use the calculator if you’re from [Scotland](http://www.saas.gov.uk/), [Wales](http://www.studentfinancewales.co.uk) or [Northern Ireland.](http://www.studentfinanceni.co.uk)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.erb
new file mode 100644
index 00000000000..82ab682c5d8
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ You need to apply for provisional category D bus entitlement then pass a category D test. You can then tow trailers up to 750kg.
+
+ To tow heavier trailers you then need to pass the D+E test.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Become a lorry or bus driver](/become-lorry-bus-driver/overview)
+
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.govspeak.erb
deleted file mode 100644
index 8d669b52224..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_bus.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- You need to apply for provisional category D bus entitlement then pass a category D test. You can then tow trailers up to 750kg.
-
- To tow heavier trailers you then need to pass the D+E test.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Become a lorry or bus driver](/become-lorry-bus-driver/overview)
-
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.erb
new file mode 100644
index 00000000000..d0960ae565c
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ If you get provisional category C large vehicle entitlement then pass the category C test you can tow trailers up to 750kg.
+
+ If you want to tow heavier trailers you can apply for provisional C+E towing entitlement and pass the C+E test.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.govspeak.erb
deleted file mode 100644
index 50f3462bf5a..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_lv.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- If you get provisional category C large vehicle entitlement then pass the category C test you can tow trailers up to 750kg.
-
- If you want to tow heavier trailers you can apply for provisional C+E towing entitlement and pass the C+E test.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.erb
new file mode 100644
index 00000000000..06ddbab9ba5
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ If you apply for a provisional C1 medium-sized vehicle licence then pass the C1 test you can tow trailers up to 750kg, as long as the combined vehicle and trailer weight is not more than 7,500kg.
+
+ If you want to tow heavier trailers you need to apply for provisional C1+E medium-sized vehicle entitlement then pass the C1+E test.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.govspeak.erb
deleted file mode 100644
index ac52c0250aa..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_msv.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- If you apply for a provisional C1 medium-sized vehicle licence then pass the C1 test you can tow trailers up to 750kg, as long as the combined vehicle and trailer weight is not more than 7,500kg.
-
- If you want to tow heavier trailers you need to apply for provisional C1+E medium-sized vehicle entitlement then pass the C1+E test.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.erb
new file mode 100644
index 00000000000..8a832b06a2d
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ If you apply for a provisional C1 medium-sized vehicle licence then pass the C1 test you can tow trailers up to 750kg, as long as the combined vehicle and trailer weight is not more than 7,500kg.
+
+ If you want to tow heavier trailers you’ll need the C1+E entitlement. You normally have to wait until you’re 21 to get this.
+
+ ##Getting the C1+E entitlement at 18
+
+ There are some cases when you can get the C1+E entitlement at 18. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
+
+ *[Driver CPC]: Driver Certificate of Professional Competence
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.govspeak.erb
deleted file mode 100644
index 2439510288e..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/apply_for_provisional_with_exceptions_msv.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- If you apply for a provisional C1 medium-sized vehicle licence then pass the C1 test you can tow trailers up to 750kg, as long as the combined vehicle and trailer weight is not more than 7,500kg.
-
- If you want to tow heavier trailers you’ll need the C1+E entitlement. You normally have to wait until you’re 21 to get this.
-
- ##Getting the C1+E entitlement at 18
-
- There are some cases when you can get the C1+E entitlement at 18. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
-
- *[Driver CPC]: Driver Certificate of Professional Competence
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.erb b/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.erb
new file mode 100644
index 00000000000..04839e22b5d
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can already tow trailers up to 3,500kg MAM (maximum authorised mass) with a car.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Vehicle weights explained](/vehicle-weights-explained)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.govspeak.erb
deleted file mode 100644
index 6f5a2d35364..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/car_light_vehicle_entitlement.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can already tow trailers up to 3,500kg MAM (maximum authorised mass) with a car.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Vehicle weights explained](/vehicle-weights-explained)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.erb
new file mode 100644
index 00000000000..7b108d656fe
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can tow trailers up to 750kg with a standard category C large vehicle licence.
+
+ If you want to tow heavier trailers you need to pass the C+E test.
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.govspeak.erb
deleted file mode 100644
index c40fcbaff9d..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/full_cat_c_entitlement.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can tow trailers up to 750kg with a standard category C large vehicle licence.
-
- If you want to tow heavier trailers you need to pass the C+E test.
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.erb
new file mode 100644
index 00000000000..ad3f92e12ed
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can already tow trailers of any weight with a car.
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.govspeak.erb
deleted file mode 100644
index 72e227c67f5..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can already tow trailers of any weight with a car.
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.erb
new file mode 100644
index 00000000000..351004179e5
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can already tow trailers up to 750kg. To tow heavier trailers you need to apply for provisional D+E towing with a bus entitlement then pass the D+E test.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.govspeak.erb
deleted file mode 100644
index 3a8aa117d37..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_bus.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can already tow trailers up to 750kg. To tow heavier trailers you need to apply for provisional D+E towing with a bus entitlement then pass the D+E test.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.erb
new file mode 100644
index 00000000000..e7cd227b247
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You can already tow with minibuses, but ‘not for hire or reward’.
+
+ You have the D1+E towing entitlement, which means you can drive minibuses with trailers over 750kg.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving a minibus](/driving-a-minibus)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.govspeak.erb
deleted file mode 100644
index fbb9be3c013..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_minibus.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You can already tow with minibuses, but ‘not for hire or reward’.
-
- You have the D1+E towing entitlement, which means you can drive minibuses with trailers over 750kg.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving a minibus](/driving-a-minibus)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.erb
new file mode 100644
index 00000000000..64fb9f52cb7
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You already have a restricted C1+E towing with a medium-sized vehicle entitlement on your licence.
+
+ This means you can tow trailers weighing more than 750kg. The total weight of the vehicle and trailer cannot be more than 8,250kg and the fully-loaded trailer cannot weigh more than the unladen vehicle weight.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.govspeak.erb
deleted file mode 100644
index 590eb0e67b0..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/full_entitlement_msv.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You already have a restricted C1+E towing with a medium-sized vehicle entitlement on your licence.
-
- This means you can tow trailers weighing more than 750kg. The total weight of the vehicle and trailer cannot be more than 8,250kg and the fully-loaded trailer cannot weigh more than the unladen vehicle weight.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.erb b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.erb
new file mode 100644
index 00000000000..bcafd712e02
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You can already tow with minibuses.
+
+ You have the D1+E towing entitlement, which means you can drive minibuses with trailers over 750kg. The total weight of vehicle and trailer cannot be more than 12,000kg and the fully loaded trailer cannot weigh more than the unladen vehicle.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving a minibus](/driving-a-minibus)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.govspeak.erb
deleted file mode 100644
index f5f588f7c8f..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_minibus.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You can already tow with minibuses.
-
- You have the D1+E towing entitlement, which means you can drive minibuses with trailers over 750kg. The total weight of vehicle and trailer cannot be more than 12,000kg and the fully loaded trailer cannot weigh more than the unladen vehicle.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving a minibus](/driving-a-minibus)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.erb
new file mode 100644
index 00000000000..6e1dace5ca2
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You already have the C1+E towing with a medium-sized vehicle entitlement on your licence.
+
+ This means you can tow trailers weighing more than 750kg with a C1 medium-sized vehicle. The total weight of the vehicle and trailer cannot be more than 12,000kg and the fully-loaded trailer cannot weigh more than the unladen vehicle weight.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.govspeak.erb
deleted file mode 100644
index 07e28590c03..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/included_entitlement_msv.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You already have the C1+E towing with a medium-sized vehicle entitlement on your licence.
-
- This means you can tow trailers weighing more than 750kg with a C1 medium-sized vehicle. The total weight of the vehicle and trailer cannot be more than 12,000kg and the fully-loaded trailer cannot weigh more than the unladen vehicle weight.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.erb
new file mode 100644
index 00000000000..e3ac66bd6eb
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ You can tow trailers up to 750kg with a standard C1 medium-sized vehicle licence as long as the vehicle weight is not more than 7,500kg.
+
+ If you want to tow heavier trailers you’ll need to pass the C1+E test.
+
+ This lets you have a restricted C1+E entitlement because you’re under 21. It lets you tow trailers heavier than 750kg as long as the combined vehicle and trailer weight is not more than 7,500kg.
+
+ Once you’re 21 you’ll automatically get the full C1+E entitlement and you can tow combinations up to 12,000kg. The fully-loaded trailer cannot weigh more than the unladen vehicle.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.govspeak.erb
deleted file mode 100644
index 0abfcbf2af3..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_conditional_trailer_entitlement_msv.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- You can tow trailers up to 750kg with a standard C1 medium-sized vehicle licence as long as the vehicle weight is not more than 7,500kg.
-
- If you want to tow heavier trailers you’ll need to pass the C1+E test.
-
- This lets you have a restricted C1+E entitlement because you’re under 21. It lets you tow trailers heavier than 750kg as long as the combined vehicle and trailer weight is not more than 7,500kg.
-
- Once you’re 21 you’ll automatically get the full C1+E entitlement and you can tow combinations up to 12,000kg. The fully-loaded trailer cannot weigh more than the unladen vehicle.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.erb
new file mode 100644
index 00000000000..6e0331e7f76
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ You need to apply for a provisional D1 minibus licence then pass a D1 minibus test to tow trailers up to 750kg.
+
+ To tow heavier trailers you can then apply for provisional D1+E towing with a minibus entitlement then pass the D1+E test.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving a minibus](/driving-a-minibus)
+
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.govspeak.erb
deleted file mode 100644
index 76b18b4d3bb..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_overall_entitlement_minibus.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- You need to apply for a provisional D1 minibus licence then pass a D1 minibus test to tow trailers up to 750kg.
-
- To tow heavier trailers you can then apply for provisional D1+E towing with a minibus entitlement then pass the D1+E test.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving a minibus](/driving-a-minibus)
-
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.erb
new file mode 100644
index 00000000000..1bf7e51ad65
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ You can already tow trailers up to 750kg with your D1 minibus licence.
+
+ To tow heavier trailers you need to apply for the provisional D1+E towing with a minibus entitlement and then pass the D1+E test. The total weight of vehicle and trailer cannot be more than 12,000kg and the fully loaded trailer cannot weigh more than the unladen vehicle.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving a minibus](/driving-a-minibus)
+
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.govspeak.erb
deleted file mode 100644
index 05fa20d992f..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_towing_entitlement_minibus.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- You can already tow trailers up to 750kg with your D1 minibus licence.
-
- To tow heavier trailers you need to apply for the provisional D1+E towing with a minibus entitlement and then pass the D1+E test. The total weight of vehicle and trailer cannot be more than 12,000kg and the fully loaded trailer cannot weigh more than the unladen vehicle.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving a minibus](/driving-a-minibus)
-
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.erb
new file mode 100644
index 00000000000..b064159d193
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.erb
@@ -0,0 +1,19 @@
+<% govspeak_for :body do %>
+ Check if you have category B or B+E on your licence.
+
+ ##Category B
+
+ You can tow trailers up to 750kg MAM (maximum authorised mass).
+
+ You can also tow larger trailers if the combined trailer and vehicle MAM is not more than 3,500kg.
+
+ ##Category B+E
+
+ You can tow trailers of any weight.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Vehicle weights explained](/vehicle-weights-explained)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.govspeak.erb
deleted file mode 100644
index 1e7a2078285..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :body do %>
- Check if you have category B or B+E on your licence.
-
- ##Category B
-
- You can tow trailers up to 750kg MAM (maximum authorised mass).
-
- You can also tow larger trailers if the combined trailer and vehicle MAM is not more than 3,500kg.
-
- ##Category B+E
-
- You can tow trailers of any weight.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Vehicle weights explained](/vehicle-weights-explained)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.erb
new file mode 100644
index 00000000000..631ad3428a7
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.erb
@@ -0,0 +1,19 @@
+<% govspeak_for :body do %>
+ You can already tow trailers up to 750kg.
+
+ You can also tow heavier trailers if the combined weight of the trailer and vehicle is not more than 3,500kg maximum authorised mass (MAM).
+
+ ##Category BE entitlement
+
+ If you have the category BE towing with a car entitlement you can tow trailers up to 3,500kg MAM.
+
+ ###Trailers over 3,500kg
+
+ You’ll need to apply for provisional C1E entitlement and take a C1E test to tow trailers weighing more than 3,500kg.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Vehicle weights explained](/vehicle-weights-explained)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.govspeak.erb
deleted file mode 100644
index 78de1aca34c..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_2013.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :body do %>
- You can already tow trailers up to 750kg.
-
- You can also tow heavier trailers if the combined weight of the trailer and vehicle is not more than 3,500kg maximum authorised mass (MAM).
-
- ##Category BE entitlement
-
- If you have the category BE towing with a car entitlement you can tow trailers up to 3,500kg MAM.
-
- ###Trailers over 3,500kg
-
- You’ll need to apply for provisional C1E entitlement and take a C1E test to tow trailers weighing more than 3,500kg.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Vehicle weights explained](/vehicle-weights-explained)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.erb
new file mode 100644
index 00000000000..a07e8303017
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ You can tow trailers up to 750kg with a standard C1 medium-sized vehicle licence as long as the towing vehicle weight is not more than 7,500kg.
+
+ If you want to tow heavier trailers you’ll need to apply for provisional C1+E entitlement then pass the C1+E test.
+
+ This will let you tow vehicle and trailer combinations up to 12,000kg. The fully loaded trailer cannot weigh more than the unladen vehicle.
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.govspeak.erb
deleted file mode 100644
index 6b95a61e43c..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/limited_trailer_entitlement_msv.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- You can tow trailers up to 750kg with a standard C1 medium-sized vehicle licence as long as the towing vehicle weight is not more than 7,500kg.
-
- If you want to tow heavier trailers you’ll need to apply for provisional C1+E entitlement then pass the C1+E test.
-
- This will let you tow vehicle and trailer combinations up to 12,000kg. The fully loaded trailer cannot weigh more than the unladen vehicle.
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.erb
new file mode 100644
index 00000000000..aeb161038e8
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ You cannot normally tow with a bus until you’re 21. You’ll then need to pass the category D test to tow trailers up to 750kg, and then pass the D+E test to tow heavier trailers.
+
+ ##Towing with a bus if you’re under 21
+
+ In some cases you can tow with a bus if you’re under 21. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
+
+ *[Driver CPC]: Driver Certificate of Professional Competence
+ *[PCV]: Passenger Carrying Vehicle
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driver CPC](/driver-certificate-of-professional-competence-cpc)
+
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.govspeak.erb
deleted file mode 100644
index eaa9921d3a5..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_bus.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- You cannot normally tow with a bus until you’re 21. You’ll then need to pass the category D test to tow trailers up to 750kg, and then pass the D+E test to tow heavier trailers.
-
- ##Towing with a bus if you’re under 21
-
- In some cases you can tow with a bus if you’re under 21. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
-
- *[Driver CPC]: Driver Certificate of Professional Competence
- *[PCV]: Passenger Carrying Vehicle
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driver CPC](/driver-certificate-of-professional-competence-cpc)
-
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.erb
new file mode 100644
index 00000000000..94758b80ced
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.erb
@@ -0,0 +1,19 @@
+<% govspeak_for :body do %>
+ In most cases you have to wait until you’re 21 to drive, or tow, with a category C large vehicle.
+
+ When you’ve got a full category C licence you can tow trailers up to 750kg. If you want to tow heavier trailers you can apply for provisional C+E towing entitlement and pass the C+E test.
+
+ ##Driving and towing with a large vehicle at 18
+
+ There are some cases when you can drive and tow with a large vehicle at 18. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
+
+ *[Driver CPC]: Driver Certificate of Professional Competence
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driver CPC](/driver-certificate-of-professional-competence-cpc)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.govspeak.erb
deleted file mode 100644
index 73d03cba476..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_lv.govspeak.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% render_content_for :body do %>
- In most cases you have to wait until you’re 21 to drive, or tow, with a category C large vehicle.
-
- When you’ve got a full category C licence you can tow trailers up to 750kg. If you want to tow heavier trailers you can apply for provisional C+E towing entitlement and pass the C+E test.
-
- ##Driving and towing with a large vehicle at 18
-
- There are some cases when you can drive and tow with a large vehicle at 18. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
-
- *[Driver CPC]: Driver Certificate of Professional Competence
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driver CPC](/driver-certificate-of-professional-competence-cpc)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.erb
new file mode 100644
index 00000000000..734595f0dbd
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ You cannot normally drive or tow with a minibus until you’re 21. You then need to first take the D1 minibus test to tow trailers up to 750kg. To tow heavier trailers you’ll then need to take the D1+E towing test.
+
+ ##Driving and towing with a minibus at 18
+
+ In some cases you can drive and tow with a minibus at 18 if you’re taking or have passed a PCV test or Driver CPC. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
+
+ *[Driver CPC]: Driver Certificate of Professional Competence
+ *[PCV]: Passenger Carrying Vehicle
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Driving a minibus](/driving-a-minibus)
+
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.govspeak.erb
deleted file mode 100644
index 49b15595092..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/not_old_enough_minibus.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- You cannot normally drive or tow with a minibus until you’re 21. You then need to first take the D1 minibus test to tow trailers up to 750kg. To tow heavier trailers you’ll then need to take the D1+E towing test.
-
- ##Driving and towing with a minibus at 18
-
- In some cases you can drive and tow with a minibus at 18 if you’re taking or have passed a PCV test or Driver CPC. See the [guide to Driver CPC](/driver-certificate-of-professional-competence-cpc) for more information.
-
- *[Driver CPC]: Driver Certificate of Professional Competence
- *[PCV]: Passenger Carrying Vehicle
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Driving a minibus](/driving-a-minibus)
-
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.erb b/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.erb
new file mode 100644
index 00000000000..59abb85c2e8
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.erb
@@ -0,0 +1,15 @@
+<% govspeak_for :body do %>
+ You’re too young to tow with a category C1 medium-sized vehicle.
+
+ You have to wait until you’re 18 to get a C1 licence, which will let you tow trailers up to 750kg as long as the combined vehicle and trailer weight is not more than 7,500kg.
+
+ To tow heavier trailers you’ll then need to get the C1+E towing entitlement. There are restrictions on this until you’re 21.
+
+ *[Driver CPC]: Driver Certificate of Professional Competence
+<% end %>
+
+<% govspeak_for :next_steps do %>
+ [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
+
+ [Driving licence categories](/driving-licence-categories)
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.govspeak.erb
deleted file mode 100644
index d527dbccc5d..00000000000
--- a/lib/smart_answer_flows/towing-rules/outcomes/too_young_msv.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :body do %>
- You’re too young to tow with a category C1 medium-sized vehicle.
-
- You have to wait until you’re 18 to get a C1 licence, which will let you tow trailers up to 750kg as long as the combined vehicle and trailer weight is not more than 7,500kg.
-
- To tow heavier trailers you’ll then need to get the C1+E towing entitlement. There are restrictions on this until you’re 21.
-
- *[Driver CPC]: Driver Certificate of Professional Competence
-<% end %>
-
-<% render_content_for :next_steps do %>
- [Adding higher categories to your driving licence](/adding-higher-categories-to-your-driving-licence)
-
- [Driving licence categories](/driving-licence-categories)
-<% 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
new file mode 100644
index 00000000000..1ae3082acbe
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you already have a full category D bus licence?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.govspeak.erb
deleted file mode 100644
index 811da8f3759..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you already have a full category D bus licence?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..f5c9f766f1d
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Did you pass your test before 1 January 1997?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.govspeak.erb
deleted file mode 100644
index b71e115ca71..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Did you pass your test before 1 January 1997?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..2ca801d7073
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When did you pass your car driving test?
+<% end %>
+
+<% options(
+ "licence-issued-before-19-Jan-2013": "Before 19 January 2013",
+ "licence-issued-after-19-Jan-2013": "From 19 January 2013"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.govspeak.erb
deleted file mode 100644
index 263bff2ceed..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When did you pass your car driving test?
-<% end %>
-
-<% options(
- "licence-issued-before-19-Jan-2013": "Before 19 January 2013",
- "licence-issued-after-19-Jan-2013": "From 19 January 2013"
-) %>
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
new file mode 100644
index 00000000000..57f06b33a72
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When was your driving licence issued?
+<% end %>
+
+<% options(
+ "before-jan-1997": "Before 1 January 1997",
+ "from-jan-1997": "From 1 January 1997"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.govspeak.erb
deleted file mode 100644
index 4e0fd6f0d11..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When was your driving licence issued?
-<% end %>
-
-<% options(
- "before-jan-1997": "Before 1 January 1997",
- "from-jan-1997": "From 1 January 1997"
-) %>
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
new file mode 100644
index 00000000000..06eb3a4df9c
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you have a full category D+E towing with a bus licence?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.govspeak.erb
deleted file mode 100644
index 9e73ce29071..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you have a full category D+E towing with a bus licence?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..502c4f3a9f8
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you already have a category C large vehicle licence?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.govspeak.erb
deleted file mode 100644
index 85e8411fd4d..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you already have a category C large vehicle licence?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..fb3c4d308d5
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.govspeak.erb
deleted file mode 100644
index bde850e3a4a..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..ff289bd7be7
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Do you already have a driving licence with any of the following entitlements on it:
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
+
+<% govspeak_for :body do %>
+ - C1+E (towing with a medium sized vehicle)
+ - C+E (towing with a large vehicle)
+ - D1+E (towing with a minibus)
+ - D+E (towing with a bus)
+
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.govspeak.erb
deleted file mode 100644
index eead6fba874..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Do you already have a driving licence with any of the following entitlements on it:
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
-
-<% render_content_for :body do %>
- - C1+E (towing with a medium sized vehicle)
- - C+E (towing with a large vehicle)
- - D1+E (towing with a minibus)
- - D+E (towing with a bus)
-
-<% 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
new file mode 100644
index 00000000000..d4d4b6f5dbc
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you have a full category D1 minibus licence?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.govspeak.erb
deleted file mode 100644
index e425e8e674c..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you have a full category D1 minibus licence?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..8115859be9c
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ When did you get this entitlement on your licence?
+<% end %>
+
+<% options(
+ "before-19-Jan-2013": "Before 19 January 2013",
+ "after-19-Jan-2013": "From 19 January 2013"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.govspeak.erb
deleted file mode 100644
index 6801716ea90..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- When did you get this entitlement on your licence?
-<% end %>
-
-<% options(
- "before-19-Jan-2013": "Before 19 January 2013",
- "after-19-Jan-2013": "From 19 January 2013"
-) %>
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
new file mode 100644
index 00000000000..f38f4c247d4
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How old are you?
+<% end %>
+
+<% options(
+ "under-21": "Under 21",
+ "21-or-over": "21 or over"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.govspeak.erb
deleted file mode 100644
index 8c3a3b9fdba..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How old are you?
-<% end %>
-
-<% options(
- "under-21": "Under 21",
- "21-or-over": "21 or over"
-) %>
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
new file mode 100644
index 00000000000..f38f4c247d4
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How old are you?
+<% end %>
+
+<% options(
+ "under-21": "Under 21",
+ "21-or-over": "21 or over"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.govspeak.erb
deleted file mode 100644
index 8c3a3b9fdba..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How old are you?
-<% end %>
-
-<% options(
- "under-21": "Under 21",
- "21-or-over": "21 or over"
-) %>
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
new file mode 100644
index 00000000000..f38f4c247d4
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How old are you?
+<% end %>
+
+<% options(
+ "under-21": "Under 21",
+ "21-or-over": "21 or over"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.govspeak.erb
deleted file mode 100644
index 8c3a3b9fdba..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How old are you?
-<% end %>
-
-<% options(
- "under-21": "Under 21",
- "21-or-over": "21 or over"
-) %>
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
new file mode 100644
index 00000000000..f38f4c247d4
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ How old are you?
+<% end %>
+
+<% options(
+ "under-21": "Under 21",
+ "21-or-over": "21 or over"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.govspeak.erb
deleted file mode 100644
index 8c3a3b9fdba..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- How old are you?
-<% end %>
-
-<% options(
- "under-21": "Under 21",
- "21-or-over": "21 or over"
-) %>
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
new file mode 100644
index 00000000000..9c1c8cfce95
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ How old are you?
+<% end %>
+
+<% options(
+ "under-18": "Under 18",
+ "under-21": "18 to 20",
+ "21-or-over": "21 or over"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.govspeak.erb
deleted file mode 100644
index d2c639e0814..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- How old are you?
-<% end %>
-
-<% options(
- "under-18": "Under 18",
- "under-21": "18 to 20",
- "21-or-over": "21 or over"
-) %>
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
new file mode 100644
index 00000000000..9d780450ec7
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you already have a C1 medium-sized vehicle licence?
+<% end %>
+
+<% options(
+ "no": "No",
+ "yes": "Yes"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.govspeak.erb
deleted file mode 100644
index c82686f093d..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you already have a C1 medium-sized vehicle licence?
-<% end %>
-
-<% options(
- "no": "No",
- "yes": "Yes"
-) %>
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
new file mode 100644
index 00000000000..8289b0b2b9d
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ What kind of vehicle do you want to tow with?
+<% end %>
+
+<% options(
+ "car-or-light-vehicle": "Car (category B)",
+ "medium-sized-vehicle": "Medium-sized vehicle (category C1)",
+ "large-vehicle": "Large vehicle (category C)",
+ "minibus": "Minibus (category D1)",
+ "bus": "Bus (category D)"
+) %>
diff --git a/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.govspeak.erb b/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.govspeak.erb
deleted file mode 100644
index e093bda5a55..00000000000
--- a/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- What kind of vehicle do you want to tow with?
-<% end %>
-
-<% options(
- "car-or-light-vehicle": "Car (category B)",
- "medium-sized-vehicle": "Medium-sized vehicle (category C1)",
- "large-vehicle": "Large vehicle (category C)",
- "minibus": "Minibus (category D1)",
- "bus": "Bus (category D)"
-) %>
diff --git a/lib/smart_answer_flows/towing-rules/towing_rules.erb b/lib/smart_answer_flows/towing-rules/towing_rules.erb
new file mode 100644
index 00000000000..9004cb4d08a
--- /dev/null
+++ b/lib/smart_answer_flows/towing-rules/towing_rules.erb
@@ -0,0 +1,16 @@
+<% text_for :title do %>
+ Towing: licence and age requirements
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Use this tool to find out if you’re old enough or have the right kind of licence to tow a trailer from different kinds of vehicle.
+
+ This tool assumes that you already have the minimum of a full car driving licence (category B). You need a full car licence before being able to tow with any larger vehicle.
+
+ ^A full car licence already lets you tow trailers weighing no more than 750kg. You can also tow heavier trailers with a car as long as the total weight of vehicle and trailer isn’t more than 3,500kg.^
+<% end %>
diff --git a/lib/smart_answer_flows/towing-rules/towing_rules.govspeak.erb b/lib/smart_answer_flows/towing-rules/towing_rules.govspeak.erb
deleted file mode 100644
index 70540e9cc3a..00000000000
--- a/lib/smart_answer_flows/towing-rules/towing_rules.govspeak.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% render_content_for :title do %>
- Towing: licence and age requirements
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Use this tool to find out if you’re old enough or have the right kind of licence to tow a trailer from different kinds of vehicle.
-
- This tool assumes that you already have the minimum of a full car driving licence (category B). You need a full car licence before being able to tow with any larger vehicle.
-
- ^A full car licence already lets you tow trailers weighing no more than 750kg. You can also tow heavier trailers with a car as long as the total weight of vehicle and trailer isn’t more than 3,500kg.^
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_already_abroad_helpline.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_already_abroad_helpline.erb
similarity index 100%
rename from lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_already_abroad_helpline.govspeak.erb
rename to lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_already_abroad_helpline.erb
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_going_abroad_helpline.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_going_abroad_helpline.erb
similarity index 100%
rename from lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_going_abroad_helpline.govspeak.erb
rename to lib/smart_answer_flows/uk-benefits-abroad/outcomes/_tax_credits_going_abroad_helpline.erb
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..f4a70176a59
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can get Bereavement Allowance, Bereavement Payment or Widowed Parent's Allowance as appropriate.
+
+ Find out how to claim:
+
+ - [Bereavement Allowance](/bereavement-allowance#how-to-claim)
+ - [Bereavement Payment](/bereavement-payment#how-to-claim)
+ - [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index e2297c0c9ee..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can get Bereavement Allowance, Bereavement Payment or Widowed Parent's Allowance as appropriate.
-
- Find out how to claim:
-
- - [Bereavement Allowance](/bereavement-allowance#how-to-claim)
- - [Bereavement Payment](/bereavement-payment#how-to-claim)
- - [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.erb
new file mode 100644
index 00000000000..3fee29b39c2
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can claim bereavement benefits while you're abroad but you won't receive any annual increases once you've left the UK.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index f65888aa506..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can claim bereavement benefits while you're abroad but you won't receive any annual increases once you've left the UK.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.erb
new file mode 100644
index 00000000000..8161ebb11f6
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can claim Bereavement Allowance, Bereavement Payment or Widowed Parent's Allowance as appropriate.
+
+ Find out how to claim:
+
+ - [Bereavement Allowance](/bereavement-allowance#how-to-claim)
+ - [Bereavement Payment](/bereavement-payment#how-to-claim)
+ - [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.govspeak.erb
deleted file mode 100644
index 7d2400038f6..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_already_abroad_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can claim Bereavement Allowance, Bereavement Payment or Widowed Parent's Allowance as appropriate.
-
- Find out how to claim:
-
- - [Bereavement Allowance](/bereavement-allowance#how-to-claim)
- - [Bereavement Payment](/bereavement-payment#how-to-claim)
- - [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..db839926322
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can export bereavement benefits to <%= country_name %> at the same rate as if you were living in the UK.
+
+ Claim [Bereavement Allowance](/bereavement-allowance#how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim) or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim) before you leave the UK.
+
+ Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to export them.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 0c7ba73a88e..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can export bereavement benefits to <%= country_name %> at the same rate as if you were living in the UK.
-
- Claim [Bereavement Allowance](/bereavement-allowance#how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim) or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim) before you leave the UK.
-
- Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to export them.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.erb
new file mode 100644
index 00000000000..55b2ccabcf5
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You can export bereavement benefits to <%= country_name %> although you won't get any annual increases after you've moved there.
+
+ Claim [Bereavement Allowance](/bereavement-allowance#how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim)
+ or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
+ as appropriate before leaving the UK.
+
+ Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to find out if you can export them.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index 8ab326b38cb..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You can export bereavement benefits to <%= country_name %> although you won't get any annual increases after you've moved there.
-
- Claim [Bereavement Allowance](/bereavement-allowance#how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim)
- or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim)
- as appropriate before leaving the UK.
-
- Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to find out if you can export them.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.erb
new file mode 100644
index 00000000000..6e15642b794
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can export bereavement benefits to <%= country_name %> although you won't get any annual increases after you've moved there.
+
+ Claim [Bereavement Allowance](/bereavement-allowance/how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim) or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim) before leaving the UK.
+
+ Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to find out if you can export them.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.govspeak.erb
deleted file mode 100644
index f94e39e8e60..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/bb_going_abroad_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can export bereavement benefits to <%= country_name %> although you won't get any annual increases after you've moved there.
-
- Claim [Bereavement Allowance](/bereavement-allowance/how-to-claim), [Bereavement Payment](/bereavement-payment#how-to-claim) or [Widowed Parent's Allowance](/widowed-parents-allowance#how-to-claim) before leaving the UK.
-
- Once you have claimed bereavement benefits, [contact the International Pension Centre](/international-pension-centre) to find out if you can export them.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.erb
new file mode 100644
index 00000000000..00cb00f8c95
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You should be able to get Child Benefit for a child or children living with you.
+
+ You may also be able to claim [Guardian's Allowance](/guardians-allowance), if you're looking after a [child whose parents have died](/child-benefit-child-parent-dies/if-one-or-both-parents-die) and you're getting Child Benefit for them.
+
+ Contact [HMRC](/child-benefit/further-information) to get Child Benefit or Guardian's Allowance<% if already_abroad %> while you're abroad <% end %>.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.govspeak.erb
deleted file mode 100644
index ee53408c728..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You should be able to get Child Benefit for a child or children living with you.
-
- You may also be able to claim [Guardian's Allowance](/guardians-allowance), if you're looking after a [child whose parents have died](/child-benefit-child-parent-dies/if-one-or-both-parents-die) and you're getting Child Benefit for them.
-
- Contact [HMRC](/child-benefit/further-information) to get Child Benefit or Guardian's Allowance<% if already_abroad %> while you're abroad <% end %>.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.erb
new file mode 100644
index 00000000000..717deaf8a1a
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ There is a social security agreement between the UK and <%= country_name %>. You may be able to get Child Benefit abroad.
+
+ Contact [HMRC](/child-benefit/further-information) to find out how to claim abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index cdbca5d7a77..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- There is a social security agreement between the UK and <%= country_name %>. You may be able to get Child Benefit abroad.
-
- Contact [HMRC](/child-benefit/further-information) to find out how to claim abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.erb
new file mode 100644
index 00000000000..b85330e6d02
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.erb
@@ -0,0 +1,10 @@
+<% govspeak_for :body do %>
+ There is a social security agreement between the UK and <%= country_name %>. You may be able to get Child Benefit abroad if you (or your spouse if you go with them):
+
+ - go to work in <%= country_name %>
+ - continue to pay National Insurance contributions
+
+ The UK and <%= country_name %> can count time you spend living or working in the other country when deciding if you qualify for benefits there.
+
+ Contact [HMRC](/child-benefit/further-information) to find out how to claim abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index b5713d7216b..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_fy_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :body do %>
- There is a social security agreement between the UK and <%= country_name %>. You may be able to get Child Benefit abroad if you (or your spouse if you go with them):
-
- - go to work in <%= country_name %>
- - continue to pay National Insurance contributions
-
- The UK and <%= country_name %> can count time you spend living or working in the other country when deciding if you qualify for benefits there.
-
- Contact [HMRC](/child-benefit/further-information) to find out how to claim abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.erb
new file mode 100644
index 00000000000..cda4556cec8
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't get Child Benefit in <%= country_name %>. If you're responsible for a child whose parents have died, you may be able to claim UK [Guardian's Allowance](/guardians-allowance) there.
+
+ Contact [HMRC](/child-benefit/further-information) to check if you're eligible.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.govspeak.erb
deleted file mode 100644
index 1bccd023f3d..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_jtu_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't get Child Benefit in <%= country_name %>. If you're responsible for a child whose parents have died, you may be able to claim UK [Guardian's Allowance](/guardians-allowance) there.
-
- Contact [HMRC](/child-benefit/further-information) to check if you're eligible.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.erb
new file mode 100644
index 00000000000..c7210736459
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can't get Child Benefit unless your circumstances change.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.govspeak.erb
deleted file mode 100644
index c583230b0c0..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_not_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can't get Child Benefit unless your circumstances change.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.erb
new file mode 100644
index 00000000000..d21f44e3197
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ There is a social security agreement between the UK and <%= country_name %>. You may be able to get [Child Benefit](/child-benefit/) abroad.
+
+ Contact [HMRC](/child-benefit/further-information) to find out if you can get Child Benefit in <%= country_name %>.
+
+ You may also be able to claim [Guardian's Allowance](/guardians-allowance), if you're responsible for a [child whose parents have died](/child-benefit-child-parent-dies/if-one-or-both-parents-die) and you're getting Child Benefit for them.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.govspeak.erb
deleted file mode 100644
index bc8d350178c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/child_benefit_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- There is a social security agreement between the UK and <%= country_name %>. You may be able to get [Child Benefit](/child-benefit/) abroad.
-
- Contact [HMRC](/child-benefit/further-information) to find out if you can get Child Benefit in <%= country_name %>.
-
- You may also be able to claim [Guardian's Allowance](/guardians-allowance), if you're responsible for a [child whose parents have died](/child-benefit-child-parent-dies/if-one-or-both-parents-die) and you're getting Child Benefit for them.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..9de3d52dad2
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You may get [Attendance Allowance](/attendance-allowance), [Carer's Allowance](/carers-allowance), [PIP](/pip) (daily living component) or the care component of Disability Living Allowance.
+
+ [Contact the Exportability Team](/exportability-team) at the Department for Work and Pensions to claim these.
+
+ *[PIP]: Personal Independence Payment
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 4252d1e3700..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You may get [Attendance Allowance](/attendance-allowance), [Carer's Allowance](/carers-allowance), [PIP](/pip) (daily living component) or the care component of Disability Living Allowance.
-
- [Contact the Exportability Team](/exportability-team) at the Department for Work and Pensions to claim these.
-
- *[PIP]: Personal Independence Payment
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.erb
new file mode 100644
index 00000000000..7def2cb02a8
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.erb
@@ -0,0 +1,10 @@
+<% govspeak_for :body do %>
+ You can't get these benefits abroad:
+
+ * [Attendance Allowance](/attendance-allowance)
+ * [Carer's Allowance](/carers-allowance)
+ * [Disability Living Allowance](/dla-disability-living-allowance-benefit)
+ * [Personal Independence Payment](/pip)
+
+ You may be able to get benefits from <%= country_name %> if you've been paying into a local insurance scheme. Contact the local authorities to find out if you qualify.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index 72f443a464f..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :body do %>
- You can't get these benefits abroad:
-
- * [Attendance Allowance](/attendance-allowance)
- * [Carer's Allowance](/carers-allowance)
- * [Disability Living Allowance](/dla-disability-living-allowance-benefit)
- * [Personal Independence Payment](/pip)
-
- You may be able to get benefits from <%= country_name %> if you've been paying into a local insurance scheme. Contact the local authorities to find out if you qualify.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.erb
new file mode 100644
index 00000000000..26520fec7ef
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can continue getting [Attendance Allowance](/attendance-allowance), [Disability Living Allowance](/dla-disability-living-allowance-benefit) or [Personal Independence Payment](/pip) for up to 13 weeks - possibly longer if you're abroad for medical treatment. You can claim [Carer's Allowance](/carers-allowance) if you take up to 4 weeks holiday out of a 26-week period.
+
+ You must have told the [Exportability Team](/exportability-team) at the Pension, Disability and Carers Service before you left.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.govspeak.erb
deleted file mode 100644
index f87fc947fe2..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_already_abroad_temporary_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can continue getting [Attendance Allowance](/attendance-allowance), [Disability Living Allowance](/dla-disability-living-allowance-benefit) or [Personal Independence Payment](/pip) for up to 13 weeks - possibly longer if you're abroad for medical treatment. You can claim [Carer's Allowance](/carers-allowance) if you take up to 4 weeks holiday out of a 26-week period.
-
- You must have told the [Exportability Team](/exportability-team) at the Pension, Disability and Carers Service before you left.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..a42988e4d50
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can carry on getting [Attendance Allowance](/attendance-allowance), [Carer's Allowance](/carers-allowance), [PIP](/pip) (daily living component) or Disability Living Allowance (care component).
+
+ The mobility portion of PIP and DLA are not exportable.
+
+ Tell the [Exportability Team](/exportability-team) at the Pension, Disability and Carers Service that you're moving abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 932ca609c41..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting [Attendance Allowance](/attendance-allowance), [Carer's Allowance](/carers-allowance), [PIP](/pip) (daily living component) or Disability Living Allowance (care component).
-
- The mobility portion of PIP and DLA are not exportable.
-
- Tell the [Exportability Team](/exportability-team) at the Pension, Disability and Carers Service that you're moving abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.erb
new file mode 100644
index 00000000000..18773781e58
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't get these benefits abroad.
+
+ You may be able to get benefits from the country you're moving to if you've paid into that country's social security insurance scheme.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index 77d78ec3253..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't get these benefits abroad.
-
- You may be able to get benefits from the country you're moving to if you've paid into that country's social security insurance scheme.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.erb
new file mode 100644
index 00000000000..9b1e7043505
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You can claim the following benefits if you're going abroad for up to 13 weeks (or 26 weeks if it's for medical treatment):
+
+ * [Attendance Allowance](/attendance-allowance)
+ * [Disability Living Allowance](/dla-disability-living-allowance-benefit)
+ * [Personal Independence Payment](/pip)
+
+ You can carry on claiming [Carer's Allowance](/carers-allowance) if you take up to 4 weeks holiday out of a 26-week period.
+
+ Tell the office that deals with your benefit that you'll be away
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.govspeak.erb
deleted file mode 100644
index 2aa24c09e1f..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/db_going_abroad_temporary_outcome.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You can claim the following benefits if you're going abroad for up to 13 weeks (or 26 weeks if it's for medical treatment):
-
- * [Attendance Allowance](/attendance-allowance)
- * [Disability Living Allowance](/dla-disability-living-allowance-benefit)
- * [Personal Independence Payment](/pip)
-
- You can carry on claiming [Carer's Allowance](/carers-allowance) if you take up to 4 weeks holiday out of a 26-week period.
-
- Tell the office that deals with your benefit that you'll be away
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..4b066cd809c
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You may be able to get ESA while abroad.
+
+ Contact the [International Pension Centre](/international-pension-centre) to get ESA.
+
+ You may be able to get benefits from <%= country_name %> if you've been paying into a local social security insurance scheme. Contact the local authorities to find out more.
+
+ *[ESA]: Employment Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 854181ff7e4..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You may be able to get ESA while abroad.
-
- Contact the [International Pension Centre](/international-pension-centre) to get ESA.
-
- You may be able to get benefits from <%= country_name %> if you've been paying into a local social security insurance scheme. Contact the local authorities to find out more.
-
- *[ESA]: Employment Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.erb
new file mode 100644
index 00000000000..7a451498aae
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get ESA.
+
+ You may be able to get benefits from <%= country_name %> if you've paid into a local social security insurance scheme. Contact the local authorities to find out more.
+
+ *[ESA]: Employment Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index 63b69df763d..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get ESA.
-
- You may be able to get benefits from <%= country_name %> if you've paid into a local social security insurance scheme. Contact the local authorities to find out more.
-
- *[ESA]: Employment Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.erb
new file mode 100644
index 00000000000..99655fc55c1
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can’t claim ESA. If you were receiving [Incapacity Benefit](/incapacity-benefit) while living in <%= country_name %>, you may be asked to transition from Incapacity Benefit to ESA (contributory).
+
+ You may also be able to get benefits from <%= country_name %> if you’ve paid into a local social security insurance scheme. Contact the local authorities to find out more.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.govspeak.erb
deleted file mode 100644
index cce91661126..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can’t claim ESA. If you were receiving [Incapacity Benefit](/incapacity-benefit) while living in <%= country_name %>, you may be asked to transition from Incapacity Benefit to ESA (contributory).
-
- You may also be able to get benefits from <%= country_name %> if you’ve paid into a local social security insurance scheme. Contact the local authorities to find out more.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.erb
new file mode 100644
index 00000000000..8637d3bbfc2
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.erb
@@ -0,0 +1,13 @@
+<% govspeak_for :body do %>
+ You can't start getting ESA while temporarily abroad.
+
+ You can carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks after leaving the UK if you were already receiving it before you left and the medical treatment is for the disease or disability for which you're getting ESA.
+
+ You must have told your local [Jobcentre Plus](/contact-jobcentre-plus) before you left.
+
+ There is no 26 week limit for NHS-funded treatment abroad.
+
+ You may be able to get benefits if you've been paying into a local security insurance scheme. Contact the local authorities to find out more.
+
+ *[ESA]: Employment and Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.govspeak.erb
deleted file mode 100644
index 2d7503ab4b1..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_medical_outcome.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :body do %>
- You can't start getting ESA while temporarily abroad.
-
- You can carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks after leaving the UK if you were already receiving it before you left and the medical treatment is for the disease or disability for which you're getting ESA.
-
- You must have told your local [Jobcentre Plus](/contact-jobcentre-plus) before you left.
-
- There is no 26 week limit for NHS-funded treatment abroad.
-
- You may be able to get benefits if you've been paying into a local security insurance scheme. Contact the local authorities to find out more.
-
- *[ESA]: Employment and Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.erb
new file mode 100644
index 00000000000..da67fa39d1b
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You can't start getting ESA while temporarily abroad.
+
+ You can carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 4 weeks after you leave the UK if you were already receiving it before you left.
+
+ You may able to get ESA for a longer temporary absence if you're the family member of a Crown servant - someone who works for the UK government abroad.
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+
+ *[ESA]: Employment Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.govspeak.erb
deleted file mode 100644
index ccd8565ce02..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_already_abroad_under_a_year_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You can't start getting ESA while temporarily abroad.
-
- You can carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 4 weeks after you leave the UK if you were already receiving it before you left.
-
- You may able to get ESA for a longer temporary absence if you're the family member of a Crown servant - someone who works for the UK government abroad.
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-
- *[ESA]: Employment Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..e0dc6aef7ac
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You may be able to continue getting [contribution-based ESA](/employment-support-allowance) abroad if you've paid enough [National Insurance contributions](/national-insurance).
+
+ Contact your local [Jobcentre Plus](/contact-jobcentre-plus) to check your contribution levels.
+
+ *[ESA]: Employment Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 238ab700a5c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You may be able to continue getting [contribution-based ESA](/employment-support-allowance) abroad if you've paid enough [National Insurance contributions](/national-insurance).
-
- Contact your local [Jobcentre Plus](/contact-jobcentre-plus) to check your contribution levels.
-
- *[ESA]: Employment Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.erb
new file mode 100644
index 00000000000..4a893e933e7
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't claim ESA.
+
+ You may be able to get benefits from <%= country_name %> if you've paid into a local social security insurance scheme.
+
+ *[ESA]: Employment Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index d3d47536063..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't claim ESA.
-
- You may be able to get benefits from <%= country_name %> if you've paid into a local social security insurance scheme.
-
- *[ESA]: Employment Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.erb
new file mode 100644
index 00000000000..5aec165a4e7
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You may be able to carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks if the medical treatment is for the disease or disability for which you're getting ESA.
+
+ There is no 26 week limit for NHS-funded treatment abroad.
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+
+ *[ESA]: Employment and Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.govspeak.erb
deleted file mode 100644
index aded85b84df..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_medical_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You may be able to carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks if the medical treatment is for the disease or disability for which you're getting ESA.
-
- There is no 26 week limit for NHS-funded treatment abroad.
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-
- *[ESA]: Employment and Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.erb
new file mode 100644
index 00000000000..48273d84781
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You may be able to carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks
+
+ You can carry on getting [ESA](/employment-support-allowance) for up to 4 weeks.
+
+ You may able to get ESA for a longer temporary absence if you're the family member of a Crown servant (someone who works for the UK government abroad).
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+
+ *[ESA]: Employment and Support Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.govspeak.erb
deleted file mode 100644
index 9d1c72b97f4..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/esa_going_abroad_under_a_year_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You may be able to carry on getting [income-related or contribution-based ESA](/employment-support-allowance) for up to 26 weeks
-
- You can carry on getting [ESA](/employment-support-allowance) for up to 4 weeks.
-
- You may able to get ESA for a longer temporary absence if you're the family member of a Crown servant (someone who works for the UK government abroad).
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-
- *[ESA]: Employment and Support Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..748696bc90e
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
+
+ Contact the [International Pension Centre](/international-pension-centre) with any questions about receiving Industrial Injuries Disablement Benefit while you're abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index fe03582b9d4..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
-
- Contact the [International Pension Centre](/international-pension-centre) with any questions about receiving Industrial Injuries Disablement Benefit while you're abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.erb
new file mode 100644
index 00000000000..773efdfcc6a
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't get Industrial Injuries Disablement Benefit abroad.
+
+ Tell the office that dealt with your benefit that you've moved abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index 3349f9038f5..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't get Industrial Injuries Disablement Benefit abroad.
-
- Tell the office that dealt with your benefit that you've moved abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.erb
new file mode 100644
index 00000000000..9ef9e86d38c
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You may be able to carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
+
+ Contact the [International Pension Centre](/international-pension-centre) for more information about claiming from abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.govspeak.erb
deleted file mode 100644
index e3ab5aa2a3c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_already_abroad_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You may be able to carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
-
- Contact the [International Pension Centre](/international-pension-centre) for more information about claiming from abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.erb
new file mode 100644
index 00000000000..2ea95e1e433
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
+
+ Tell the office that deals with your benefit that you're planning to move abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.govspeak.erb
deleted file mode 100644
index 20cc7d4531c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_eea_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
-
- Tell the office that deals with your benefit that you're planning to move abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.erb
new file mode 100644
index 00000000000..9c317aa6936
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't get Industrial Injuries Disablement Benefit while you're abroad.
+
+ Tell the office that deals with your benefit that you're planning to move abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.govspeak.erb
deleted file mode 100644
index bca46985d26..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't get Industrial Injuries Disablement Benefit while you're abroad.
-
- Tell the office that deals with your benefit that you're planning to move abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.erb
new file mode 100644
index 00000000000..4ba7311e0ae
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ The UK and <%= country_name %> have a social security agreement. You may be able to carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
+
+ Tell the office that deals with your benefit that you're planning to move abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.govspeak.erb
deleted file mode 100644
index 7fc307948db..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_going_abroad_ss_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- The UK and <%= country_name %> have a social security agreement. You may be able to carry on getting [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit).
-
- Tell the office that deals with your benefit that you're planning to move abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.erb
new file mode 100644
index 00000000000..6c25329de77
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.erb
@@ -0,0 +1,18 @@
+<% govspeak_for :body do %>
+ You may be able to get [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit) if you <% if already_abroad %>continued to<% end %> pay UK National Insurance while working in an [EEA country](/claiming-benefits-move-travel-abroad/where-you-can-claim-benefits).
+
+ This benefit is also covered by social security agreements. Your UK social security payments may help you qualify for benefits in:
+
+ - Barbados
+ - Bermuda
+ - Canada
+ - Israel
+ - Jamaica
+ - Jersey and Guernsey
+ - Mauritius
+ - The Philippines
+ - the republics of the former Yugoslavia
+ - Turkey
+
+ Contact the [International Pension Centre](/international-pension-centre) to claim and for the records you need to qualify for another country's benefits.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.govspeak.erb
deleted file mode 100644
index 026c4ee566a..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/iidb_maybe_outcome.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :body do %>
- You may be able to get [Industrial Injuries Disablement Benefit](/industrial-injuries-disablement-benefit) if you <% if already_abroad %>continued to<% end %> pay UK National Insurance while working in an [EEA country](/claiming-benefits-move-travel-abroad/where-you-can-claim-benefits).
-
- This benefit is also covered by social security agreements. Your UK social security payments may help you qualify for benefits in:
-
- - Barbados
- - Bermuda
- - Canada
- - Israel
- - Jamaica
- - Jersey and Guernsey
- - Mauritius
- - The Philippines
- - the republics of the former Yugoslavia
- - Turkey
-
- Contact the [International Pension Centre](/international-pension-centre) to claim and for the records you need to qualify for another country's benefits.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.erb
new file mode 100644
index 00000000000..41c66040ecd
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can carry on getting [Income Support](/income-support) for up to 4 weeks while you're abroad.
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.govspeak.erb
deleted file mode 100644
index 18c1e6ba61c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_abroad_for_treatment_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting [Income Support](/income-support) for up to 4 weeks while you're abroad.
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.erb
new file mode 100644
index 00000000000..91db6b360f4
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't apply for [Income Support](/income-support) while you're abroad.
+
+ Ask the authorities in the country you live in about any benefits you might be entitled to.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index 6b0b3410eba..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't apply for [Income Support](/income-support) while you're abroad.
-
- Ask the authorities in the country you live in about any benefits you might be entitled to.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.erb
new file mode 100644
index 00000000000..90cf3cd8791
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can carry on getting [Income Support](/income-support) for the first 4 weeks that you're abroad.
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.govspeak.erb
deleted file mode 100644
index 9169ea9d3ea..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_claiming_benefits_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting [Income Support](/income-support) for the first 4 weeks that you're abroad.
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.erb
new file mode 100644
index 00000000000..015ba7982aa
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can't get [Income Support](/income-support) abroad if you're moving abroad for more than 1 year.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.govspeak.erb
deleted file mode 100644
index d2c7ff9e96e..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_more_than_a_year_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can't get [Income Support](/income-support) abroad if you're moving abroad for more than 1 year.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.erb
new file mode 100644
index 00000000000..3db1e270fe3
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can't get [Income Support](/income-support) while you're abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.govspeak.erb
deleted file mode 100644
index 2d506b54c27..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_not_eligible_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can't get [Income Support](/income-support) while you're abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.erb
new file mode 100644
index 00000000000..a710f9923cd
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.erb
@@ -0,0 +1,9 @@
+<% govspeak_for :body do %>
+ You may be able to carry on getting [Income Support](/income-support) for up to 8 weeks if your child is receiving medical treatment.
+
+ You can't get Income Support while you're abroad if you're going for treatment for yourself.
+
+ There is no 8 week limit for NHS-funded treatment abroad for either you or your child.
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.govspeak.erb
deleted file mode 100644
index d266a54aa8d..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/is_under_a_year_medical_outcome.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :body do %>
- You may be able to carry on getting [Income Support](/income-support) for up to 8 weeks if your child is receiving medical treatment.
-
- You can't get Income Support while you're abroad if you're going for treatment for yourself.
-
- There is no 8 week limit for NHS-funded treatment abroad for either you or your child.
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) before you go.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.erb
new file mode 100644
index 00000000000..ff5af1cebbb
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get JSA while you're abroad. You may qualify for unemployment benefits in <%= country_name %>.
+
+ Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
+
+ *[JSA]: Jobseeker's Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index ede0113bb0f..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get JSA while you're abroad. You may qualify for unemployment benefits in <%= country_name %>.
-
- Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
-
- *[JSA]: Jobseeker's Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.erb
new file mode 100644
index 00000000000..1d22bf8cbe3
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.erb
@@ -0,0 +1,27 @@
+<% govspeak_for :body do %>
+ You can’t claim [income-based JSA](/jobseekers-allowance/overview) abroad.
+
+ You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you're going abroad to look for work and you:
+
+ - are entitled to it on the day you go abroad
+ - register as a jobseeker at least 4 weeks before you leave
+ - are looking for work in the UK up to the day you leave
+ - register at the equivalent of a Jobcentre in the country you're going to
+ - follow the other country's rules on registering and looking for work
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
+
+ You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
+
+
+ $A
+ Jobseekers and Benefit Enhancement Section (JBES)
+ Room TC013
+ International Pension Centre
+ Tyneview Park
+ Newcastle Upon Tyne
+ NE98 1BA
+ $A
+
+ *[JSA]: Jobseeker's Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index 90d50241510..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_eea_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% render_content_for :body do %>
- You can’t claim [income-based JSA](/jobseekers-allowance/overview) abroad.
-
- You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you're going abroad to look for work and you:
-
- - are entitled to it on the day you go abroad
- - register as a jobseeker at least 4 weeks before you leave
- - are looking for work in the UK up to the day you leave
- - register at the equivalent of a Jobcentre in the country you're going to
- - follow the other country's rules on registering and looking for work
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
-
- You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
-
-
- $A
- Jobseekers and Benefit Enhancement Section (JBES)
- Room TC013
- International Pension Centre
- Tyneview Park
- Newcastle Upon Tyne
- NE98 1BA
- $A
-
- *[JSA]: Jobseeker's Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.erb
new file mode 100644
index 00000000000..c6601816e08
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.erb
@@ -0,0 +1,28 @@
+<% govspeak_for :body do %>
+ You can't claim [income-based JSA](/jobseekers-allowance/overview) abroad.
+
+ You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you’re going to an [EEA country](/eu-eea) or Jersey or Guernsey to look for work and you:
+
+ - are entitled to it on the day you go abroad
+ - register as a jobseeker at least 4 weeks before you leave
+ - are looking for work in the UK up to the day you leave
+ - register at the equivalent of a Jobcentre in the country you're going to
+ - follow the other country's rules on registering and looking for work
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
+
+ You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
+
+
+ $A
+ Jobseekers and Benefit Enhancement Section (JBES)
+ Room TC013
+ International Pension Centre
+ Tyneview Park
+ Newcastle Upon Tyne
+ NE98 1BA
+ $A
+
+ *[JSA]: Jobseeker's Allowance
+ *[JBES]: Jobseekers and Benefit Enhancement Section
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.govspeak.erb
deleted file mode 100644
index 597be5feb74..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_medical_outcome.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :body do %>
- You can't claim [income-based JSA](/jobseekers-allowance/overview) abroad.
-
- You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you’re going to an [EEA country](/eu-eea) or Jersey or Guernsey to look for work and you:
-
- - are entitled to it on the day you go abroad
- - register as a jobseeker at least 4 weeks before you leave
- - are looking for work in the UK up to the day you leave
- - register at the equivalent of a Jobcentre in the country you're going to
- - follow the other country's rules on registering and looking for work
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
-
- You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
-
-
- $A
- Jobseekers and Benefit Enhancement Section (JBES)
- Room TC013
- International Pension Centre
- Tyneview Park
- Newcastle Upon Tyne
- NE98 1BA
- $A
-
- *[JSA]: Jobseeker's Allowance
- *[JBES]: Jobseekers and Benefit Enhancement Section
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.erb
new file mode 100644
index 00000000000..c6601816e08
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.erb
@@ -0,0 +1,28 @@
+<% govspeak_for :body do %>
+ You can't claim [income-based JSA](/jobseekers-allowance/overview) abroad.
+
+ You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you’re going to an [EEA country](/eu-eea) or Jersey or Guernsey to look for work and you:
+
+ - are entitled to it on the day you go abroad
+ - register as a jobseeker at least 4 weeks before you leave
+ - are looking for work in the UK up to the day you leave
+ - register at the equivalent of a Jobcentre in the country you're going to
+ - follow the other country's rules on registering and looking for work
+
+ Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
+
+ You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
+
+
+ $A
+ Jobseekers and Benefit Enhancement Section (JBES)
+ Room TC013
+ International Pension Centre
+ Tyneview Park
+ Newcastle Upon Tyne
+ NE98 1BA
+ $A
+
+ *[JSA]: Jobseeker's Allowance
+ *[JBES]: Jobseekers and Benefit Enhancement Section
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.govspeak.erb
deleted file mode 100644
index 597be5feb74..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_less_than_a_year_other_outcome.govspeak.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% render_content_for :body do %>
- You can't claim [income-based JSA](/jobseekers-allowance/overview) abroad.
-
- You can get [contribution-based JSA](/jobseekers-allowance) for up to 3 months if you’re going to an [EEA country](/eu-eea) or Jersey or Guernsey to look for work and you:
-
- - are entitled to it on the day you go abroad
- - register as a jobseeker at least 4 weeks before you leave
- - are looking for work in the UK up to the day you leave
- - register at the equivalent of a Jobcentre in the country you're going to
- - follow the other country's rules on registering and looking for work
-
- Tell your local [Jobcentre Plus](/contact-jobcentre-plus) that you want to move and get JSA while you're abroad.
-
- You'll also need to get form U2 from Jobseekers and Benefit Enhancement Section (JBES) which will allow you to register with the unemployment services in the country you're going to.
-
-
- $A
- Jobseekers and Benefit Enhancement Section (JBES)
- Room TC013
- International Pension Centre
- Tyneview Park
- Newcastle Upon Tyne
- NE98 1BA
- $A
-
- *[JSA]: Jobseeker's Allowance
- *[JBES]: Jobseekers and Benefit Enhancement Section
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.erb
new file mode 100644
index 00000000000..d59c065207e
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get JSA abroad.
+
+ Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
+
+ *[JSA]: Jobseeker's Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.govspeak.erb
deleted file mode 100644
index bcf10278b11..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_not_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get JSA abroad.
-
- Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
-
- *[JSA]: Jobseeker's Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.erb
new file mode 100644
index 00000000000..93653c47fcb
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can’t claim JSA from abroad. You may qualify for unemployment benefits in <%= country_name %>.
+
+ Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
+
+ *[JSA]: Jobseeker's Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index 0ebe1f731cf..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can’t claim JSA from abroad. You may qualify for unemployment benefits in <%= country_name %>.
-
- Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
-
- *[JSA]: Jobseeker's Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.erb
new file mode 100644
index 00000000000..38f41ec9477
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get JSA while you're abroad. Your [UK National Insurance contributions](/national-insurance) may help you qualify for unemployment benefits because of the UK's social security agreements with <%= country_name %>.
+
+ Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
+
+ *[JSA]: Jobseeker's Allowance
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index 2a6fb8ba447..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/jsa_social_security_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get JSA while you're abroad. Your [UK National Insurance contributions](/national-insurance) may help you qualify for unemployment benefits because of the UK's social security agreements with <%= country_name %>.
-
- Ask the authorities in <%= country_name %> about any benefits you might be entitled to.
-
- *[JSA]: Jobseeker's Allowance
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.erb
new file mode 100644
index 00000000000..d539e3be9a7
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can get [Statutory Maternity Pay](/statutory-maternity-pay#how-to-claim).
+
+ Contact the [International Pension Centre](/international-pension-centre) to claim Statutory Maternity Pay from abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.govspeak.erb
deleted file mode 100644
index 2ab192aa6d7..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_eea_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can get [Statutory Maternity Pay](/statutory-maternity-pay#how-to-claim).
-
- Contact the [International Pension Centre](/international-pension-centre) to claim Statutory Maternity Pay from abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.erb
new file mode 100644
index 00000000000..383a8550cc6
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get Statutory Maternity Pay <% if already_abroad %> while you're abroad <% end %>.
+
+ You may be able to get [Maternity Allowance](/maternity-allowance).
+
+ Contact the [International Pension Centre](/international-pension-centre) with any questions about how to start or continue claiming while abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.govspeak.erb
deleted file mode 100644
index 039a130d945..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_maternity_allowance_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get Statutory Maternity Pay <% if already_abroad %> while you're abroad <% end %>.
-
- You may be able to get [Maternity Allowance](/maternity-allowance).
-
- Contact the [International Pension Centre](/international-pension-centre) with any questions about how to start or continue claiming while abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.erb
new file mode 100644
index 00000000000..f4d81e4e4da
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can't get UK Statutory Maternity Pay or Maternity Allowance.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.govspeak.erb
deleted file mode 100644
index 88ce74a835d..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_not_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can't get UK Statutory Maternity Pay or Maternity Allowance.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.erb
new file mode 100644
index 00000000000..b25fee685e6
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get Statutory Maternity Pay while you're abroad.
+
+ You may be able to get [Maternity Allowance](/maternity-allowance).
+
+ Contact the [International Pension Centre](/international-pension-centre) to find out if you qualify.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index 514ea3c803f..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get Statutory Maternity Pay while you're abroad.
-
- You may be able to get [Maternity Allowance](/maternity-allowance).
-
- Contact the [International Pension Centre](/international-pension-centre) to find out if you qualify.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.erb
new file mode 100644
index 00000000000..4d8b5736361
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can't get Statutory Maternity Pay if you go abroad.
+
+ You may be able to get [Maternity Allowance](/maternity-allowance).
+
+ Contact the [International Pension Centre](/international-pension-centre) to find out if you qualify.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index 1855c4c9f44..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/maternity_benefits_social_security_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can't get Statutory Maternity Pay if you go abroad.
-
- You may be able to get [Maternity Allowance](/maternity-allowance).
-
- Contact the [International Pension Centre](/international-pension-centre) to find out if you qualify.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.erb
new file mode 100644
index 00000000000..d1e746eef9a
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can get your [State Pension while you're abroad](/state-pension-if-you-retire-abroad/how-to-claim).
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.govspeak.erb
deleted file mode 100644
index 998dc56cef0..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_already_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can get your [State Pension while you're abroad](/state-pension-if-you-retire-abroad/how-to-claim).
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.erb
new file mode 100644
index 00000000000..64992ef6c46
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can carry on getting your [State Pension while you're abroad](/state-pension-if-you-retire-abroad). Contact the [International Pension Centre](/international-pension-centre) to find out how moving abroad will affect your pension.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index ae5bfb86abe..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/pension_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can carry on getting your [State Pension while you're abroad](/state-pension-if-you-retire-abroad). Contact the [International Pension Centre](/international-pension-centre) to find out how moving abroad will affect your pension.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.erb
new file mode 100644
index 00000000000..7a1cd0b80cf
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can claim [Statutory Sick Pay](/statutory-sick-pay-ssp#how-to-claim).
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.govspeak.erb
deleted file mode 100644
index b2fcc319c65..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can claim [Statutory Sick Pay](/statutory-sick-pay-ssp#how-to-claim).
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.erb
new file mode 100644
index 00000000000..737e011e299
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't claim Statutory Sick Pay.
+
+ You may be able to get benefits from <%= country_name %> if you've paid into a social security insurance scheme there.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.govspeak.erb
deleted file mode 100644
index 2a8313436ec..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_already_abroad_not_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't claim Statutory Sick Pay.
-
- You may be able to get benefits from <%= country_name %> if you've paid into a social security insurance scheme there.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.erb
new file mode 100644
index 00000000000..b54ff02752f
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can export your Statutory Sick Pay. [Claim Statutory Sick Pay](/statutory-sick-pay-ssp/how-to-claim) the usual way, or talk to your employer about exporting it.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.govspeak.erb
deleted file mode 100644
index 1268dfd92b6..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can export your Statutory Sick Pay. [Claim Statutory Sick Pay](/statutory-sick-pay-ssp/how-to-claim) the usual way, or talk to your employer about exporting it.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.erb
new file mode 100644
index 00000000000..ee04639bd6f
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You can't get Statutory Sick Pay while you're abroad.
+
+ You may be able to get benefits from <%= country_name %> if you've paid into a social security insurance scheme there.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.govspeak.erb
deleted file mode 100644
index abc44c558ed..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/ssp_going_abroad_not_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You can't get Statutory Sick Pay while you're abroad.
-
- You may be able to get benefits from <%= country_name %> if you've paid into a social security insurance scheme there.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.erb
new file mode 100644
index 00000000000..4a1602ed9ec
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.erb
@@ -0,0 +1,34 @@
+<% govspeak_for :body do %>
+ <% if already_abroad %>
+ You may be able to claim tax credits while you're abroad.
+ <% else %>
+ You may be able to get tax credits while you're abroad.
+ <% end %>
+
+ ##Working Tax Credit
+
+ You could get [Working Tax Credit](/working-tax-credit) if you either:
+
+ - live in Switzerland or an [European Economic Area](/eu-eea) (EEA) country and travel to the UK to work
+ - travel abroad to work, but are ‘ordinarily resident' in the UK
+
+ ^Ordinarily resident means you normally live in the UK, and plan to stay for the time being.^
+
+ ##Child Tax Credit
+
+ You could get [Child Tax Credit](/child-tax-credit) if:
+
+ - you are ordinarily resident in the UK
+ - you work in the UK and pay [National Insurance contributions](/national-insurance) here
+ - your child lives in an EEA country or in Switzerland and depends on you to support them
+
+ Contact the Tax Credits Helpline to claim.
+
+ <% if already_abroad %>
+ <%= render partial: 'tax_credits_already_abroad_helpline' %>
+ <% else %>
+ <%= render partial: 'tax_credits_going_abroad_helpline' %>
+ <% end %>
+
+ *[EEA]: European Economic Area
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.govspeak.erb
deleted file mode 100644
index 0505c36ee7e..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_cross_border_worker_outcome.govspeak.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<% render_content_for :body do %>
- <% if already_abroad %>
- You may be able to claim tax credits while you're abroad.
- <% else %>
- You may be able to get tax credits while you're abroad.
- <% end %>
-
- ##Working Tax Credit
-
- You could get [Working Tax Credit](/working-tax-credit) if you either:
-
- - live in Switzerland or an [European Economic Area](/eu-eea) (EEA) country and travel to the UK to work
- - travel abroad to work, but are ‘ordinarily resident' in the UK
-
- ^Ordinarily resident means you normally live in the UK, and plan to stay for the time being.^
-
- ##Child Tax Credit
-
- You could get [Child Tax Credit](/child-tax-credit) if:
-
- - you are ordinarily resident in the UK
- - you work in the UK and pay [National Insurance contributions](/national-insurance) here
- - your child lives in an EEA country or in Switzerland and depends on you to support them
-
- Contact the Tax Credits Helpline to claim.
-
- <% if already_abroad %>
- <%= render partial: 'tax_credits_already_abroad_helpline.govspeak.erb' %>
- <% else %>
- <%= render partial: 'tax_credits_going_abroad_helpline.govspeak.erb' %>
- <% end %>
-
- *[EEA]: European Economic Area
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.erb
new file mode 100644
index 00000000000..fcae9835cbc
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.erb
@@ -0,0 +1,11 @@
+<% govspeak_for :body do %>
+ You may be able to get tax credits while you're abroad.
+
+ Contact the Tax Credits Helpline to claim.
+
+ <% if already_abroad %>
+ <%= render partial: 'tax_credits_already_abroad_helpline' %>
+ <% else %>
+ <%= render partial: 'tax_credits_going_abroad_helpline' %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.govspeak.erb
deleted file mode 100644
index 64a9eaab21c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_crown_servant_outcome.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :body do %>
- You may be able to get tax credits while you're abroad.
-
- Contact the Tax Credits Helpline to claim.
-
- <% if already_abroad %>
- <%= render partial: 'tax_credits_already_abroad_helpline.govspeak.erb' %>
- <% else %>
- <%= render partial: 'tax_credits_going_abroad_helpline.govspeak.erb' %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.erb
new file mode 100644
index 00000000000..bfdae130128
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You may qualify for [Child Tax Credit](/child-tax-credit).
+
+ Contact the Tax Credits Helpline to claim.
+
+ <%= render partial: 'tax_credits_going_abroad_helpline' %>
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.govspeak.erb
deleted file mode 100644
index acf5267c2cf..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_eea_entitled_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You may qualify for [Child Tax Credit](/child-tax-credit).
-
- Contact the Tax Credits Helpline to claim.
-
- <%= render partial: 'tax_credits_going_abroad_helpline.govspeak.erb' %>
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.erb
new file mode 100644
index 00000000000..ac7fef7db88
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ <% if already_abroad %>
+ You can carry on getting tax credits for up to 8 weeks after leaving the UK if you were already receiving them before you left.
+ <% else %>
+ You may be able to carry on getting tax credits for up to 8 weeks.
+ <% end %>
+
+ You must let the Tax Credit Office know within 1 month of the date you find out if you need to stay abroad for longer than 8 weeks.
+
+ You can receive tax credits for longer in some circumstances. You can be fined £300 if you receive credits you shouldn't have.
+
+ <% if already_abroad %>
+ <%= render partial: 'tax_credits_already_abroad_helpline' %>
+ <% else %>
+ <%= render partial: 'tax_credits_going_abroad_helpline' %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.govspeak.erb
deleted file mode 100644
index d13bc95e386..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_holiday_outcome.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- <% if already_abroad %>
- You can carry on getting tax credits for up to 8 weeks after leaving the UK if you were already receiving them before you left.
- <% else %>
- You may be able to carry on getting tax credits for up to 8 weeks.
- <% end %>
-
- You must let the Tax Credit Office know within 1 month of the date you find out if you need to stay abroad for longer than 8 weeks.
-
- You can receive tax credits for longer in some circumstances. You can be fined £300 if you receive credits you shouldn't have.
-
- <% if already_abroad %>
- <%= render partial: 'tax_credits_already_abroad_helpline.govspeak.erb' %>
- <% else %>
- <%= render partial: 'tax_credits_going_abroad_helpline.govspeak.erb' %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.erb
new file mode 100644
index 00000000000..94a29ab985c
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.erb
@@ -0,0 +1,17 @@
+<% govspeak_for :body do %>
+ <% if already_abroad %>
+ You can carry on getting tax credits for up to 12 weeks after leaving the UK if you were already receiving them before you left.
+ <% else %>
+ You may be able to carry on getting tax credits for up to 12 weeks.
+ <% end %>
+
+ You must let the Tax Credit Office know within 1 month of the date you find out if you need to stay abroad for longer than 12 weeks.
+
+ You can receive tax credits for longer in some circumstances. You can be fined £300 if you receive credits you shouldn't have.
+
+ <% if already_abroad %>
+ <%= render partial: 'tax_credits_already_abroad_helpline' %>
+ <% else %>
+ <%= render partial: 'tax_credits_going_abroad_helpline' %>
+ <% end %>
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.govspeak.erb
deleted file mode 100644
index 19e9bcea54f..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_medical_death_outcome.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :body do %>
- <% if already_abroad %>
- You can carry on getting tax credits for up to 12 weeks after leaving the UK if you were already receiving them before you left.
- <% else %>
- You may be able to carry on getting tax credits for up to 12 weeks.
- <% end %>
-
- You must let the Tax Credit Office know within 1 month of the date you find out if you need to stay abroad for longer than 12 weeks.
-
- You can receive tax credits for longer in some circumstances. You can be fined £300 if you receive credits you shouldn't have.
-
- <% if already_abroad %>
- <%= render partial: 'tax_credits_already_abroad_helpline.govspeak.erb' %>
- <% else %>
- <%= render partial: 'tax_credits_going_abroad_helpline.govspeak.erb' %>
- <% end %>
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.erb
new file mode 100644
index 00000000000..6e4a0ccc41a
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.erb
@@ -0,0 +1,5 @@
+<% govspeak_for :body do %>
+ You're unlikely to get tax credits unless your circumstances change.
+
+ Find out who is [eligible to claim tax credits](/claim-tax-credits#eligibility).
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.govspeak.erb
deleted file mode 100644
index 50513a08d76..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/tax_credits_unlikely_outcome.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% render_content_for :body do %>
- You're unlikely to get tax credits unless your circumstances change.
-
- Find out who is [eligible to claim tax credits](/claim-tax-credits#eligibility).
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.erb
new file mode 100644
index 00000000000..a751a5cf670
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can get [Winter Fuel Payments](/winter-fuel-payment) while you’re abroad if you have a genuine link with the UK, eg if you’ve lived and worked in the UK for most of your life.
+
+ You must be living in an [EEA country](/eu-eea) or Switzerland during the 3rd week of September immediately before the winter you’re claiming the Winter Fuel Payment for.
+
+ Contact the [International Pension Centre](/international-pension-centre) to set up your claim.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.govspeak.erb
deleted file mode 100644
index 23eed8a85e1..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_eea_eligible_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can get [Winter Fuel Payments](/winter-fuel-payment) while you’re abroad if you have a genuine link with the UK, eg if you’ve lived and worked in the UK for most of your life.
-
- You must be living in an [EEA country](/eu-eea) or Switzerland during the 3rd week of September immediately before the winter you’re claiming the Winter Fuel Payment for.
-
- Contact the [International Pension Centre](/international-pension-centre) to set up your claim.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.erb
new file mode 100644
index 00000000000..c031d0ab24b
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.erb
@@ -0,0 +1,7 @@
+<% govspeak_for :body do %>
+ You can get the [Winter Fuel Payment](/winter-fuel-payment/eligibility) if you have a genuine link with the UK, eg if you’ve lived and worked in the UK for most of your life.
+
+ You must be living in an [European Economic Area (EEA)](/eu-eea) country or Switzerland during the 3rd week of September immediately before the winter you’re claiming the Winter Fuel Payment for.
+
+ Contact the [International Pension Centre](/international-pension-centre) to transfer your claim abroad.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.govspeak.erb
deleted file mode 100644
index 72dc8b38002..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_going_abroad_outcome.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :body do %>
- You can get the [Winter Fuel Payment](/winter-fuel-payment/eligibility) if you have a genuine link with the UK, eg if you’ve lived and worked in the UK for most of your life.
-
- You must be living in an [European Economic Area (EEA)](/eu-eea) country or Switzerland during the 3rd week of September immediately before the winter you’re claiming the Winter Fuel Payment for.
-
- Contact the [International Pension Centre](/international-pension-centre) to transfer your claim abroad.
-<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.erb
new file mode 100644
index 00000000000..f372ad5da98
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.erb
@@ -0,0 +1,3 @@
+<% govspeak_for :body do %>
+ You can't get Winter Fuel Payments while you're abroad unless you live in the [European Economic Area (EEA)](/eu-eea) or Switzerland.
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.govspeak.erb
deleted file mode 100644
index 2b47feb1e77..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/outcomes/wfp_not_eligible_outcome.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_for :body do %>
- You can't get Winter Fuel Payments while you're abroad unless you live in the [European Economic Area (EEA)](/eu-eea) or Switzerland.
-<% 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
new file mode 100644
index 00000000000..0b045443d4a
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb
deleted file mode 100644
index 4fc6fdb20cb..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..7c24f53602f
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ <%= how_long_question_titles %>
+<% end %>
+
+<% options(
+ "temporary": "Temporarily, eg for a holiday",
+ "permanent": "Permanently"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb
deleted file mode 100644
index 06cec7e933e..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- <%= how_long_question_titles %>
-<% end %>
-
-<% options(
- "temporary": "Temporarily, eg for a holiday",
- "permanent": "Permanently"
-) %>
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
new file mode 100644
index 00000000000..e130fce6569
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Does the following apply to you?
+<% end %>
+
+<% text_for :hint do %>
+ If you do not receive any of these click 'Next step'.
+
+<% end %>
+
+<% options(calculator.state_benefits) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb
deleted file mode 100644
index 6d47f184851..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Does the following apply to you?
-<% end %>
-
-<% render_content_for :hint do %>
- If you do not receive any of these click 'Next step'.
-
-<% end %>
-
-<% options(calculator.state_benefits) %>
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
new file mode 100644
index 00000000000..c7ee3c2c9ce
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Are you eligible for Statutory Maternity Pay?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ If you're unsure you can read our [Maternity pay and leave guide](/statutory-maternity-pay#eligibility)
+
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb
deleted file mode 100644
index 513247e0bf3..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Are you eligible for Statutory Maternity Pay?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- If you're unsure you can read our [Maternity pay and leave guide](/statutory-maternity-pay#eligibility)
-
-<% 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
new file mode 100644
index 00000000000..9290cfb91e1
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Are you or your partner one of the following?
+<% end %>
+
+<% options(
+ "crown_servant": "A Crown servant",
+ "cross_border_worker": "A cross-border worker",
+ "none_of_the_above": "None of the above"
+) %>
+
+<% 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/eligible_for_tax_credits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.govspeak.erb
deleted file mode 100644
index 73569bcd6ff..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Are you or your partner one of the following?
-<% end %>
-
-<% options(
- "crown_servant": "A Crown servant",
- "cross_border_worker": "A cross-border worker",
- "none_of_the_above": "None of the above"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..d6a56ae9d3f
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Is your employer paying National Insurance contributions for you?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb
deleted file mode 100644
index c673565b6ba..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Is your employer paying National Insurance contributions for you?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..01254ae4107
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ <%= how_long_question_titles %>
+<% end %>
+
+<% options(
+ "esa_under_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child",
+ "esa_under_a_year_other": "Less than 1 year, for a different reason",
+ "esa_more_than_a_year": "More than 1 year#{already_abroad_text_two}"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb
deleted file mode 100644
index b1b6147207c..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- <%= how_long_question_titles %>
-<% end %>
-
-<% options(
- "esa_under_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child",
- "esa_under_a_year_other": "Less than 1 year, for a different reason",
- "esa_more_than_a_year": "More than 1 year#{already_abroad_text_two}"
-) %>
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
new file mode 100644
index 00000000000..52796c522bd
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you currently:
+<% end %>
+
+<% options(
+ "going_abroad": "in the UK and planning to move abroad",
+ "already_abroad": "someone who has lived and worked in the UK who is now living abroad"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb
deleted file mode 100644
index 9d466d9c595..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you currently:
-<% end %>
-
-<% options(
- "going_abroad": "in the UK and planning to move abroad",
- "already_abroad": "someone who has lived and worked in the UK who is now living abroad"
-) %>
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
new file mode 100644
index 00000000000..73ac521371c
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you currently receiving Industrial Injuries Disablement Benefit?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb
deleted file mode 100644
index d466bc70657..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you currently receiving Industrial Injuries Disablement Benefit?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..4ed2d699a14
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you going abroad to get medical treatment for the illness or disability that prevents you from working?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb
deleted file mode 100644
index 358bac580a9..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you going abroad to get medical treatment for the illness or disability that prevents you from working?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..98254e05f83
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Do any of the following apply to you?
+<% end %>
+
+<% govspeak_for :body do %>
+ If none apply, click ‘Next Step’.
+
+<% end %>
+
+<% options(calculator.all_dispute_criteria) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb
deleted file mode 100644
index 198096d47e2..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Do any of the following apply to you?
-<% end %>
-
-<% render_content_for :body do %>
- If none apply, click ‘Next Step’.
-
-<% end %>
-
-<% options(calculator.all_dispute_criteria) %>
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
new file mode 100644
index 00000000000..17e77e3b3ad
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Are you travelling abroad with a partner who is getting Income Support with one of the following premiums ?
+<% end %>
+
+<% govspeak_for :body do %>
+ Your partner must be getting the premium, not you.
+<% end %>
+
+<% text_for :hint do %>
+ If no, click ‘Next Step’.
+<% end %>
+
+<% options(calculator.premiums) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb
deleted file mode 100644
index 12426d2db37..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Are you travelling abroad with a partner who is getting Income Support with one of the following premiums ?
-<% end %>
-
-<% render_content_for :body do %>
- Your partner must be getting the premium, not you.
-<% end %>
-
-<% render_content_for :hint do %>
- If no, click ‘Next Step’.
-<% end %>
-
-<% options(calculator.premiums) %>
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
new file mode 100644
index 00000000000..1e2e4bb8e70
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Which of these applies to you?
+<% end %>
+
+<% text_for :hint do %>
+ If neither apply, click 'Next Step'.
+
+<% end %>
+
+<% options(calculator.impairments) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb
deleted file mode 100644
index 03cd49f02d8..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Which of these applies to you?
-<% end %>
-
-<% render_content_for :hint do %>
- If neither apply, click 'Next Step'.
-
-<% end %>
-
-<% options(calculator.impairments) %>
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
new file mode 100644
index 00000000000..15807d422ea
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How long are you going abroad for?
+<% end %>
+
+<% options(
+ "is_under_a_year_medical": "Less than 1 year, to get medical treatment for you or your child",
+ "is_under_a_year_other": "Less than 1 year, for a different reason",
+ "is_more_than_a_year": "More than 1 year"
+) %>
+
+<% 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_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.govspeak.erb
deleted file mode 100644
index a6e64a7dfb0..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How long are you going abroad for?
-<% end %>
-
-<% options(
- "is_under_a_year_medical": "Less than 1 year, to get medical treatment for you or your child",
- "is_under_a_year_other": "Less than 1 year, for a different reason",
- "is_more_than_a_year": "More than 1 year"
-) %>
-
-<% render_content_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
new file mode 100644
index 00000000000..0f60cec8280
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Have you been unable to work or received Statutory Sick Pay for one of the following?
+<% end %>
+
+<% text_for :hint do %>
+ If you don’t receive either of these click 'Next step'.
+
+<% end %>
+
+<% options(calculator.periods_of_impairment) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb
deleted file mode 100644
index a764cf6e821..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_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 %>
- If you don’t receive either of these click 'Next step'.
-
-<% end %>
-
-<% options(calculator.periods_of_impairment) %>
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
new file mode 100644
index 00000000000..3b6993d8cc5
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.erb
@@ -0,0 +1,14 @@
+<% text_for :title do %>
+ If you're claiming JSA, how long are you going abroad for?
+<% end %>
+
+<% options(
+ "less_than_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child ",
+ "less_than_a_year_other": "Less than 1 year, for a different reason",
+ "more_than_a_year": "More than 1 year"
+) %>
+
+<% govspeak_for :body do %>
+ *[JSA]: Jobseeker's Allowance
+
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb
deleted file mode 100644
index 02df190b858..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% render_content_for :title do %>
- If you're claiming JSA, how long are you going abroad for?
-<% end %>
-
-<% options(
- "less_than_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child ",
- "less_than_a_year_other": "Less than 1 year, for a different reason",
- "more_than_a_year": "More than 1 year"
-) %>
-
-<% render_content_for :body do %>
- *[JSA]: Jobseeker's Allowance
-
-<% 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
new file mode 100644
index 00000000000..c8c36e56191
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Do you have any children?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb
deleted file mode 100644
index 2aeed383874..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Do you have any children?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..b2324f00913
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.erb
@@ -0,0 +1,10 @@
+<% text_for :title do %>
+ Are you currently claiming any of the following?
+<% end %>
+
+<% text_for :hint do %>
+ If you don’t receive any of these click 'Next step'.
+
+<% end %>
+
+<% options(calculator.tax_credits_benefits) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb
deleted file mode 100644
index d91b8c143a5..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% render_content_for :title do %>
- Are you currently claiming any of the following?
-<% end %>
-
-<% render_content_for :hint do %>
- If you don’t receive any of these click 'Next step'.
-
-<% end %>
-
-<% options(calculator.tax_credits_benefits) %>
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
new file mode 100644
index 00000000000..e8cdec7d826
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ <%= how_long_question_titles %>
+<% end %>
+
+<% options(
+ "tax_credits_up_to_a_year": "Up to 1 year",
+ "tax_credits_more_than_a_year": "More than 1 year or permanently"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb
deleted file mode 100644
index 2eb2b187957..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- <%= how_long_question_titles %>
-<% end %>
-
-<% options(
- "tax_credits_up_to_a_year": "Up to 1 year",
- "tax_credits_more_than_a_year": "More than 1 year or permanently"
-) %>
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
new file mode 100644
index 00000000000..2c7627e07b8
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.erb
@@ -0,0 +1,9 @@
+<% text_for :title do %>
+ <%= why_abroad_question_title %>
+<% end %>
+
+<% options(
+ "tax_credits_holiday": "A holiday or business trip",
+ "tax_credits_medical_treatment": "For medical treatment for yourself, your partner or your child",
+ "tax_credits_death": "Because of the death of your partner, child or close family member"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb
deleted file mode 100644
index 9bfc89c6e32..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% render_content_for :title do %>
- <%= why_abroad_question_title %>
-<% end %>
-
-<% options(
- "tax_credits_holiday": "A holiday or business trip",
- "tax_credits_medical_treatment": "For medical treatment for yourself, your partner or your child",
- "tax_credits_death": "Because of the death of your partner, child or close family member"
-) %>
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
new file mode 100644
index 00000000000..ca249b1b76d
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.erb
@@ -0,0 +1,18 @@
+<% text_for :title do %>
+ Which benefit will you be claiming?
+<% end %>
+
+<% options(
+ "jsa": "Jobseeker's Allowance (JSA)",
+ "pension": "State Pension",
+ "winter_fuel_payment": "Winter Fuel Payment",
+ "maternity_benefits": "Maternity benefits",
+ "child_benefit": "Child Benefit",
+ "iidb": "Industrial Injuries Disablement Benefit",
+ "ssp": "Statutory Sick Pay (SSP)",
+ "esa": "Employment and Support Allowance (ESA)",
+ "disability_benefits": "Benefits for carers and people with disabilities ",
+ "bereavement_benefits": "Bereavement benefits",
+ "tax_credits": "Tax credits",
+ "income_support": "Income Support"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb
deleted file mode 100644
index 30315904abe..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :title do %>
- Which benefit will you be claiming?
-<% end %>
-
-<% options(
- "jsa": "Jobseeker's Allowance (JSA)",
- "pension": "State Pension",
- "winter_fuel_payment": "Winter Fuel Payment",
- "maternity_benefits": "Maternity benefits",
- "child_benefit": "Child Benefit",
- "iidb": "Industrial Injuries Disablement Benefit",
- "ssp": "Statutory Sick Pay (SSP)",
- "esa": "Employment and Support Allowance (ESA)",
- "disability_benefits": "Benefits for carers and people with disabilities ",
- "bereavement_benefits": "Bereavement benefits",
- "tax_credits": "Tax credits",
- "income_support": "Income Support"
-) %>
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
new file mode 100644
index 00000000000..c4c6fe08ee1
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.erb
@@ -0,0 +1,3 @@
+<% text_for :title do %>
+ <%= country_question_title %>
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb
deleted file mode 100644
index 2ee71e22398..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% render_content_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
new file mode 100644
index 00000000000..428ba0d5c63
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ Are you working for a UK employer and paying Class 1 National Insurance Contributions?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
+
+<% govspeak_for :body do %>
+ If you're unsure you can read our [National Insurance Guide](/national-insurance/how-much-national-insurance-you-pay).
+
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb
deleted file mode 100644
index 2040a8a3c55..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- Are you working for a UK employer and paying Class 1 National Insurance Contributions?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
-
-<% render_content_for :body do %>
- If you're unsure you can read our [National Insurance Guide](/national-insurance/how-much-national-insurance-you-pay).
-
-<% 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
new file mode 100644
index 00000000000..f1c3c4d7ad0
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.erb
@@ -0,0 +1,8 @@
+<% text_for :title do %>
+ Are you working for a UK employer?
+<% end %>
+
+<% options(
+ "yes": "Yes",
+ "no": "No"
+) %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb
deleted file mode 100644
index 2a971e7a3f1..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% render_content_for :title do %>
- Are you working for a UK employer?
-<% end %>
-
-<% options(
- "yes": "Yes",
- "no": "No"
-) %>
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
new file mode 100644
index 00000000000..0474fc79ba9
--- /dev/null
+++ b/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.erb
@@ -0,0 +1,20 @@
+<% text_for :title do %>
+ UK benefits if you're going or living abroad
+<% end %>
+
+<% 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 %>
+
+<% govspeak_for :body do %>
+ Find out which UK benefits you might be able to get while you're abroad and how to claim them.
+
+ The UK has social security agreements with some countries that:
+
+ - allow you to claim some benefits while you're there
+ - mean that your National Insurance contributions can count towards your eligibility for that country's benefits
+
+ It's easier to organise benefits before you leave.
+
+ ^You must meet the benefit's eligibility criteria to get it.^
+<% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.govspeak.erb
deleted file mode 100644
index fd0b9e9cedf..00000000000
--- a/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.govspeak.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<% render_content_for :title do %>
- UK benefits if you're going or living abroad
-<% end %>
-
-<% render_content_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 %>
-
-<% render_content_for :body do %>
- Find out which UK benefits you might be able to get while you're abroad and how to claim them.
-
- The UK has social security agreements with some countries that:
-
- - allow you to claim some benefits while you're there
- - mean that your National Insurance contributions can count towards your eligibility for that country's benefits
-
- It's easier to organise benefits before you leave.
-
- ^You must meet the benefit's eligibility criteria to get it.^
-<% 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
new file mode 100644
index 00000000000..131d2dd651e
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Paying by Bacs Direct Credit
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can pay is <%= last_payment_date %>.
+
+ The money must have cleared by <%= funds_received_by %>.
+
+ You need your VAT registration number as the payment reference.
+
+ ^Check beforehand how long it takes to send a payment and what your daily transfer limit is.^
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.govspeak.erb
deleted file mode 100644
index 235031587b4..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Paying by Bacs Direct Credit
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can pay is <%= last_payment_date %>.
-
- The money must have cleared by <%= funds_received_by %>.
-
- You need your VAT registration number as the payment reference.
-
- ^Check beforehand how long it takes to send a payment and what your daily transfer limit is.^
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..087e2c32ff7
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Paying by Bank Giro
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can pay is <%= last_payment_date %>.
+
+ The money must have cleared by <%= funds_received_by %>.
+
+ You’ll need a book of paying-in slips from HMRC with your VAT number and HRMC’s account details.
+
+ To order the slips can take up to 6 weeks.
+
+ Read more about [how to pay your VAT and how to order paying-in slips.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.govspeak.erb
deleted file mode 100644
index 48f12a2e64c..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Paying by Bank Giro
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can pay is <%= last_payment_date %>.
-
- The money must have cleared by <%= funds_received_by %>.
-
- You’ll need a book of paying-in slips from HMRC with your VAT number and HRMC’s account details.
-
- To order the slips can take up to 6 weeks.
-
- Read more about [how to pay your VAT and how to order paying-in slips.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..e0119f76722
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.erb
@@ -0,0 +1,17 @@
+<% text_for :title do %>
+ Paying by CHAPS
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can pay is <%= last_payment_date %>.
+
+ HMRC must receive the money by <%= funds_received_by %>.
+
+ You need your VAT registration number as the payment reference.
+
+ CHAPS payments usually reach HMRC the same working day if you pay within your bank’s processing times.
+
+ ^Check your bank’s transaction limits and processing times before making a payment.^
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.govspeak.erb
deleted file mode 100644
index 16bb6177e17..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.govspeak.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% render_content_for :title do %>
- Paying by CHAPS
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can pay is <%= last_payment_date %>.
-
- HMRC must receive the money by <%= funds_received_by %>.
-
- You need your VAT registration number as the payment reference.
-
- CHAPS payments usually reach HMRC the same working day if you pay within your bank’s processing times.
-
- ^Check your bank’s transaction limits and processing times before making a payment.^
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..a581d6da686
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Paying by cheque
+<% end %>
+
+<% govspeak_for :body do %>
+ You can only pay by cheque if you’re exempt from submitting online VAT returns. If you need to pay by cheque for any other reason, pay by Bank Giro.
+
+ The last day you can post your cheque is <%= last_posting_date %>.
+
+ Your cheque must have cleared by <%= funds_cleared_by %>.
+
+ ^The date your cheque clears is the day when your payment reach HRMC’s account. It’s not the day when they get your cheque in the post.^
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.govspeak.erb
deleted file mode 100644
index 85356c3b216..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Paying by cheque
-<% end %>
-
-<% render_content_for :body do %>
- You can only pay by cheque if you’re exempt from submitting online VAT returns. If you need to pay by cheque for any other reason, pay by Bank Giro.
-
- The last day you can post your cheque is <%= last_posting_date %>.
-
- Your cheque must have cleared by <%= funds_cleared_by %>.
-
- ^The date your cheque clears is the day when your payment reach HRMC’s account. It’s not the day when they get your cheque in the post.^
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..a312c356ee7
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.erb
@@ -0,0 +1,15 @@
+<% text_for :title do %>
+ Paying by direct debit
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can set up a direct debit is <%= last_dd_setup_date %>.
+
+ The date the money will be taken from your account is <%= funds_taken %>.
+
+ ^You must set up your direct debit before you submit your next VAT online return.^
+
+ You only need to set up the direct debit once.
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.govspeak.erb
deleted file mode 100644
index e0b012a6ca6..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.govspeak.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% render_content_for :title do %>
- Paying by direct debit
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can set up a direct debit is <%= last_dd_setup_date %>.
-
- The date the money will be taken from your account is <%= funds_taken %>.
-
- ^You must set up your direct debit before you submit your next VAT online return.^
-
- You only need to set up the direct debit once.
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..a0070f45800
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Paying by online debit or credit card
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can pay is <%= last_payment_date %>.
+
+ The money must have cleared by <%= funds_received_by %>.
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.govspeak.erb
deleted file mode 100644
index 7205efd362c..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Paying by online debit or credit card
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can pay is <%= last_payment_date %>.
-
- The money must have cleared by <%= funds_received_by %>.
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..e30644f0847
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.erb
@@ -0,0 +1,11 @@
+<% text_for :title do %>
+ Paying online or by telephone banking
+<% end %>
+
+<% govspeak_for :body do %>
+ The last date you can pay is <%= last_payment_date %>.
+
+ You need your VAT registration number as the payment reference.
+
+ Read more about [how to pay your VAT.](/pay-vat)
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.govspeak.erb
deleted file mode 100644
index 31b5fe95aa2..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.govspeak.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% render_content_for :title do %>
- Paying online or by telephone banking
-<% end %>
-
-<% render_content_for :body do %>
- The last date you can pay is <%= last_payment_date %>.
-
- You need your VAT registration number as the payment reference.
-
- Read more about [how to pay your VAT.](/pay-vat)
-<% 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
new file mode 100644
index 00000000000..a8465bdcf6b
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.erb
@@ -0,0 +1,13 @@
+<% text_for :title do %>
+ How do you want to pay?
+<% end %>
+
+<% options(
+ "direct-debit": "Direct debit",
+ "online-telephone-banking": "Online or telephone banking (Faster Payments)",
+ "online-debit-credit-card": "Online debit or credit card (BillPay)",
+ "bacs-direct-credit": "Bacs direct credit",
+ "bank-giro": "Bank Giro",
+ "chaps": "CHAPS",
+ "cheque": "Cheque"
+) %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.govspeak.erb
deleted file mode 100644
index 0d3e265568b..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.govspeak.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% render_content_for :title do %>
- How do you want to pay?
-<% end %>
-
-<% options(
- "direct-debit": "Direct debit",
- "online-telephone-banking": "Online or telephone banking (Faster Payments)",
- "online-debit-credit-card": "Online debit or credit card (BillPay)",
- "bacs-direct-credit": "Bacs direct credit",
- "bank-giro": "Bank Giro",
- "chaps": "CHAPS",
- "cheque": "Cheque"
-) %>
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
new file mode 100644
index 00000000000..f33e2e651c7
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.erb
@@ -0,0 +1,7 @@
+<% text_for :title do %>
+ When does your VAT accounting period end?
+<% end %>
+
+<% 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/questions/when_does_your_vat_accounting_period_end.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.govspeak.erb
deleted file mode 100644
index d4d62153cc0..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.govspeak.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% render_content_for :title do %>
- When does your VAT accounting period end?
-<% end %>
-
-<% render_content_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
new file mode 100644
index 00000000000..e52750286a6
--- /dev/null
+++ b/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.erb
@@ -0,0 +1,18 @@
+<% text_for :title do %>
+ VAT payment deadline calculator
+<% end %>
+
+<% text_for :meta_description do %>
+ Work out the VAT payment deadline for your accounting period.
+<% end %>
+
+<% govspeak_for :body do %>
+ Work out the VAT payment deadline for your accounting period.
+
+ You can't use this calculator if you make payments on account or use the annual
+ accounting scheme.
+
+^ Because of coronavirus (COVID‑19), you can delay (defer) any VAT payments due between 20 March 2020 and 30 June 2020. If you choose to defer a VAT payment, you will have until 31 March 2021 to pay it.
+
+ Most businesses must [keep digital VAT records and use software to submit VAT Returns](/guidance/check-when-a-business-must-follow-the-rules-for-making-tax-digital-for-vat).
+<% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.govspeak.erb b/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.govspeak.erb
deleted file mode 100644
index 3f3fdcc2e2e..00000000000
--- a/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.govspeak.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% render_content_for :title do %>
- VAT payment deadline calculator
-<% end %>
-
-<% render_content_for :meta_description do %>
- Work out the VAT payment deadline for your accounting period.
-<% end %>
-
-<% render_content_for :body do %>
- Work out the VAT payment deadline for your accounting period.
-
- You can't use this calculator if you make payments on account or use the annual
- accounting scheme.
-
-^ Because of coronavirus (COVID‑19), you can delay (defer) any VAT payments due between 20 March 2020 and 30 June 2020. If you choose to defer a VAT payment, you will have until 31 March 2021 to pay it.
-
- Most businesses must [keep digital VAT records and use software to submit VAT Returns](/guidance/check-when-a-business-must-follow-the-rules-for-making-tax-digital-for-vat).
-<% end %>