diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index dd513e912..65106c8f4 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -44,14 +44,14 @@ class FormHandler
     forms
   end
 
-private
-
   def current_collection_start_year
     today = Time.zone.now
     window_end_date = Time.zone.local(today.year, 4, 1)
     today < window_end_date ? today.year - 1 : today.year
   end
 
+private
+
   def get_all_forms
     lettings_forms.merge(sales_forms)
   end
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 42e0d49e8..c5c153cc8 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -66,7 +66,8 @@ class LettingsLog < Log
   def form_name
     return unless startdate
 
-    "#{collection_start_year}_#{collection_start_year + 1}"
+    form_mappings = { 0 => "current_lettings", 1 => "previous_lettings", -1 => "next_lettings" }
+    form_mappings[FormHandler.instance.current_collection_start_year - collection_start_year] if collection_start_year.present?
   end
 
   def self.editable_fields
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index bc2f1785b..a0d9e620a 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -27,9 +27,9 @@ RSpec.describe LettingsLog do
     it "has returns the correct form based on the start date" do
       expect(lettings_log.form_name).to be_nil
       expect(lettings_log.form).to be_a(Form)
-      expect(lettings_log_2.form_name).to eq("2021_2022")
+      expect(lettings_log_2.form_name).to eq("previous_lettings")
       expect(lettings_log_2.form).to be_a(Form)
-      expect(lettings_log_year_2.form_name).to eq("2023_2024")
+      expect(lettings_log_year_2.form_name).to eq("next_lettings")
       expect(lettings_log_year_2.form).to be_a(Form)
     end
 
diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb
index f419ba30c..b6a6734d9 100644
--- a/spec/services/exports/lettings_log_export_service_spec.rb
+++ b/spec/services/exports/lettings_log_export_service_spec.rb
@@ -33,8 +33,8 @@ RSpec.describe Exports::LettingsLogExportService do
     allow(storage_service).to receive(:write_file)
 
     # Stub the form handler to use the real form
-    allow(FormHandler.instance).to receive(:get_form).with("2021_2022").and_return(real_2021_2022_form)
-    allow(FormHandler.instance).to receive(:get_form).with("2022_2023").and_return(real_2022_2023_form)
+    allow(FormHandler.instance).to receive(:get_form).with("previous_lettings").and_return(real_2021_2022_form)
+    allow(FormHandler.instance).to receive(:get_form).with("current_lettings").and_return(real_2022_2023_form)
   end
 
   context "when exporting daily lettings logs in XML" do
diff --git a/spec/services/imports/lettings_logs_field_import_service_spec.rb b/spec/services/imports/lettings_logs_field_import_service_spec.rb
index 386cde725..1b5a4298f 100644
--- a/spec/services/imports/lettings_logs_field_import_service_spec.rb
+++ b/spec/services/imports/lettings_logs_field_import_service_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Imports::LettingsLogsFieldImportService do
     FactoryBot.create(:user, old_user_id:, organisation:)
 
     # Stub the form handler to use the real form
-    allow(FormHandler.instance).to receive(:get_form).with("2021_2022").and_return(real_2021_2022_form)
+    allow(FormHandler.instance).to receive(:get_form).with("previous_lettings").and_return(real_2021_2022_form)
 
     WebMock.stub_request(:get, /api.postcodes.io\/postcodes\/LS166FT/)
            .to_return(status: 200, body: '{"status":200,"result":{"codes":{"admin_district":"E08000035"}}}', headers: {})
diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb
index 3af3601a2..65cd0c402 100644
--- a/spec/services/imports/lettings_logs_import_service_spec.rb
+++ b/spec/services/imports/lettings_logs_import_service_spec.rb
@@ -35,8 +35,8 @@ RSpec.describe Imports::LettingsLogsImportService do
     FactoryBot.create(:location, old_visible_id: 10, postcode: "LS166FT", scheme_id: scheme2.id, mobility_type: "W")
 
     # Stub the form handler to use the real form
-    allow(FormHandler.instance).to receive(:get_form).with("2021_2022").and_return(real_2021_2022_form)
-    allow(FormHandler.instance).to receive(:get_form).with("2022_2023").and_return(real_2022_2023_form)
+    allow(FormHandler.instance).to receive(:get_form).with("previous_lettings").and_return(real_2021_2022_form)
+    allow(FormHandler.instance).to receive(:get_form).with("current_lettings").and_return(real_2022_2023_form)
   end
 
   context "when importing lettings logs" do