diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a95aa6fd..27dcd2e36 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -61,27 +61,17 @@ en:
           <<: *bulk_upload__row_parser__base
         bulk_upload/sales/year2023/row_parser:
           <<: *bulk_upload__row_parser__base
-        forms/bulk_upload_lettings/year:
+        forms/bulk_upload_form/year:
           attributes:
             year:
               blank: "You must select a collection period to upload for."
-        forms/bulk_upload_sales/year:
-          attributes:
-            year:
-              blank: "You must select a collection period to upload for."
-        forms/bulk_upload_lettings/upload_your_file:
-          attributes:
-            file:
-              blank: "Select which file to upload."
-              not_csv: "Your file must be in CSV format."
-              file_too_large: "File must be 10MB or less. Check your file and delete data that does not need to be uploaded."
-        forms/bulk_upload_sales/upload_your_file:
+        forms/bulk_upload_form/upload_your_file:
           attributes:
             file:
               blank: "Select which file to upload."
               not_csv: "Your file must be in CSV format."
               file_too_large: "File must be 10MB or less. Check your file and delete data that does not need to be uploaded."
-        forms/bulk_upload_lettings/needstype:
+        forms/bulk_upload_form/needstype:
           attributes:
             needstype:
               blank: "You must answer needs type."
diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb
index b3e403cbf..3dabfdeac 100644
--- a/spec/features/bulk_upload_lettings_logs_spec.rb
+++ b/spec/features/bulk_upload_lettings_logs_spec.rb
@@ -55,13 +55,13 @@ RSpec.describe "Bulk upload lettings log" do
       expect(page).to have_content("Upload your file")
       click_button("Upload")
 
-      allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("not a csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("not a csv")
 
       expect(page).to have_content("Select which file to upload")
       attach_file "file", file_fixture("2023_24_lettings_bulk_upload.xlsx")
       click_button("Upload")
 
-      allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("text/csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("text/csv")
 
       expect(page).to have_content("Your file must be in CSV format")
       attach_file "file", file_fixture("blank_bulk_upload_sales.csv")
@@ -76,7 +76,7 @@ RSpec.describe "Bulk upload lettings log" do
     end
 
     it "shows file to large error" do
-      stub_const("Forms::BulkUploadLettings::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
+      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
       visit("/lettings-logs")
 
       click_link("Upload lettings logs in bulk")
@@ -86,7 +86,7 @@ RSpec.describe "Bulk upload lettings log" do
       click_button("Continue")
       click_button("Continue")
 
-      allow_any_instance_of(Forms::BulkUploadLettings::UploadYourFile).to receive(:`).and_return("text/csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("text/csv")
 
       attach_file "file", file_fixture("2023_24_lettings_bulk_upload.xlsx")
       click_button("Upload")
diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb
index b32df43e1..1ff0d9fb0 100644
--- a/spec/features/bulk_upload_sales_logs_spec.rb
+++ b/spec/features/bulk_upload_sales_logs_spec.rb
@@ -52,13 +52,13 @@ RSpec.describe "Bulk upload sales log" do
       expect(page).to have_content("Upload your file")
       click_button("Upload")
 
-      allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("not a csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("not a csv")
 
       expect(page).to have_content("Select which file to upload")
       attach_file "file", file_fixture("2023_24_lettings_bulk_upload.xlsx")
       click_button("Upload")
 
-      allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("text/csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("text/csv")
 
       expect(page).to have_content("Your file must be in CSV format")
       attach_file "file", file_fixture("blank_bulk_upload_sales.csv")
@@ -73,7 +73,7 @@ RSpec.describe "Bulk upload sales log" do
     end
 
     it "shows file to large error" do
-      stub_const("Forms::BulkUploadSales::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
+      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
       visit("/sales-logs")
       click_link("Upload sales logs in bulk")
 
@@ -84,7 +84,7 @@ RSpec.describe "Bulk upload sales log" do
       click_button("Continue")
       click_button("Continue")
 
-      allow_any_instance_of(Forms::BulkUploadSales::UploadYourFile).to receive(:`).and_return("text/csv")
+      allow_any_instance_of(Forms::BulkUploadForm::UploadYourFile).to receive(:`).and_return("text/csv")
 
       attach_file "file", file_fixture("2023_24_lettings_bulk_upload.xlsx")
       click_button("Upload")