diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py
index 0cd260f35..28c0ea5ef 100644
--- a/app/dao/notifications_dao.py
+++ b/app/dao/notifications_dao.py
@@ -407,7 +407,7 @@ def _delete_letters_from_s3(
             prefix = get_letter_pdf_filename(reference=letter.reference,
                                              crown=letter.service.crown,
                                              sending_date=letter.created_at,
-                                             is_scan_letter=letter.key_type == KEY_TYPE_TEST,
+                                             dont_use_sending_date=letter.key_type == KEY_TYPE_TEST,
                                              postage=letter.postage)
             s3_objects = get_s3_bucket_objects(bucket_name=bucket_name, subfolder=prefix)
             for s3_object in s3_objects:
diff --git a/app/letters/utils.py b/app/letters/utils.py
index 48a6f405c..25836f475 100644
--- a/app/letters/utils.py
+++ b/app/letters/utils.py
@@ -25,8 +25,8 @@ LETTERS_PDF_FILE_LOCATION_STRUCTURE = \
 PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}'
 
 
-def get_folder_name(_now, is_test_or_scan_letter=False):
-    if is_test_or_scan_letter:
+def get_folder_name(_now, dont_use_sending_date=False):
+    if dont_use_sending_date:
         folder_name = ''
     else:
         print_datetime = convert_utc_to_bst(_now)
@@ -36,9 +36,9 @@ def get_folder_name(_now, is_test_or_scan_letter=False):
     return folder_name
 
 
-def get_letter_pdf_filename(reference, crown, sending_date, is_scan_letter=False, postage=SECOND_CLASS):
+def get_letter_pdf_filename(reference, crown, sending_date, dont_use_sending_date=False, postage=SECOND_CLASS):
     upload_file_name = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format(
-        folder=get_folder_name(sending_date, is_scan_letter),
+        folder=get_folder_name(sending_date, dont_use_sending_date),
         reference=reference,
         duplex="D",
         letter_class=RESOLVE_POSTAGE_FOR_FILE_NAME[postage],
@@ -81,7 +81,7 @@ def upload_letter_pdf(notification, pdf_data, precompiled=False):
         reference=notification.reference,
         crown=notification.service.crown,
         sending_date=notification.created_at,
-        is_scan_letter=precompiled or notification.key_type == KEY_TYPE_TEST,
+        dont_use_sending_date=precompiled or notification.key_type == KEY_TYPE_TEST,
         postage=notification.postage
     )
 
diff --git a/app/service/send_notification.py b/app/service/send_notification.py
index 7ccb6ca36..00c78936b 100644
--- a/app/service/send_notification.py
+++ b/app/service/send_notification.py
@@ -181,7 +181,7 @@ def send_pdf_letter_notification(service_id, post_data):
         reference=notification.reference,
         crown=notification.service.crown,
         sending_date=notification.created_at,
-        is_scan_letter=False,
+        dont_use_sending_date=False,
         postage=notification.postage
     )
 
diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py
index ea8e926c5..844ada741 100644
--- a/tests/app/letters/test_letter_utils.py
+++ b/tests/app/letters/test_letter_utils.py
@@ -160,7 +160,8 @@ def test_get_letter_pdf_filename_returns_correct_postage_for_filename(
 def test_get_letter_pdf_filename_returns_correct_filename_for_test_letters(
         notify_api, mocker):
     sending_date = datetime(2017, 12, 4, 17, 29)
-    filename = get_letter_pdf_filename(reference='foo', crown='C', sending_date=sending_date, is_scan_letter=True)
+    filename = get_letter_pdf_filename(reference='foo', crown='C',
+                                       sending_date=sending_date, dont_use_sending_date=True)
 
     assert filename == 'NOTIFY.FOO.D.2.C.C.20171204172900.PDF'
 
@@ -215,7 +216,7 @@ def test_upload_letter_pdf_to_correct_bucket(
         reference=sample_letter_notification.reference,
         crown=sample_letter_notification.service.crown,
         sending_date=sample_letter_notification.created_at,
-        is_scan_letter=is_precompiled_letter
+        dont_use_sending_date=is_precompiled_letter
     )
 
     upload_letter_pdf(sample_letter_notification, b'\x00\x01', precompiled=is_precompiled_letter)
@@ -242,7 +243,7 @@ def test_upload_letter_pdf_uses_postage_from_notification(
         reference=letter_notification.reference,
         crown=letter_notification.service.crown,
         sending_date=letter_notification.created_at,
-        is_scan_letter=False,
+        dont_use_sending_date=False,
         postage=letter_notification.postage
     )
 
@@ -329,12 +330,12 @@ def test_copy_redaction_failed_pdf(notify_api):
 def test_get_folder_name_in_british_summer_time(notify_api, freeze_date, expected_folder_name):
     with freeze_time(freeze_date):
         now = datetime.utcnow()
-        folder_name = get_folder_name(_now=now, is_test_or_scan_letter=False)
+        folder_name = get_folder_name(_now=now, dont_use_sending_date=False)
     assert folder_name == expected_folder_name
 
 
 def test_get_folder_name_returns_empty_string_for_test_letter():
-    assert '' == get_folder_name(datetime.utcnow(), is_test_or_scan_letter=True)
+    assert '' == get_folder_name(datetime.utcnow(), dont_use_sending_date=True)
 
 
 @freeze_time('2017-07-07 20:00:00')