diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 5be791d51..c828cebcd 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -11,7 +11,7 @@ class CaseLogsController < ApplicationController
 
     respond_to do |format|
       format.html
-      format.csv { send_data @case_logs.to_csv, filename: "case-logs-#{Time.zone.now}" }
+      format.csv { send_data @case_logs.to_csv, filename: "logs-#{Time.zone.now}.csv" }
     end
   end
 
diff --git a/app/models/concerns/generate_csv.rb b/app/models/concerns/generate_csv.rb
index 36aaa8462..8c418475d 100644
--- a/app/models/concerns/generate_csv.rb
+++ b/app/models/concerns/generate_csv.rb
@@ -4,7 +4,7 @@ module GenerateCsv
   class_methods do
     def to_csv
       CSV.generate(headers: true) do |csv|
-        csv << self.attribute_names
+        csv << attribute_names
 
         all.each do |record|
           csv << record.attributes.values
diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb
index dd78c7c00..4f2de0157 100644
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@@ -3,7 +3,7 @@
     <span class="govuk-!-margin-right-4">
       <strong><%= pagy.count %></strong> total <%= title.downcase %>
     </span>
-    <a class="govuk-link" href="#" download="">Download (CSV)</a>
+    <a class="govuk-link" download href="/logs.csv">Download (CSV)</a>
   </figcaption>
   <section class="app-table-group" tabindex="0" aria-labelledby="<%= title.dasherize %>">
     <table class="govuk-table">
diff --git a/spec/requests/case_logs_controller_spec.rb b/spec/requests/case_logs_controller_spec.rb
index 4e85cc8ef..3a4dff2ef 100644
--- a/spec/requests/case_logs_controller_spec.rb
+++ b/spec/requests/case_logs_controller_spec.rb
@@ -208,7 +208,7 @@ RSpec.describe CaseLogsController, type: :request do
       end
 
       it "shows the download csv link" do
-        expect(page).to have_link("Download (CSV)")
+        expect(page).to have_link("Download (CSV)", href: "/logs.csv")
       end
 
       context "when there are more than 20 logs" do