diff --git a/applications/SAL/handler.py b/applications/SAL/handler.py
index c975a039..69f4c04d 100644
--- a/applications/SAL/handler.py
+++ b/applications/SAL/handler.py
@@ -4,7 +4,7 @@ from orchestration.sal_orchestrator import (
     SALOrchestrator,
 )
 from infrastructure.csv_s3_client import CsvS3Client
-from repositories.raw_address.raw_address_csv_s3_repository import (
+from repositories.raw_address.raw_address_list_csv_s3_repository import (
     RawAddressListCsvS3Repository,
 )
 from domain.addresses.raw_address import AddressList
diff --git a/applications/postcode_splitter/handler.py b/applications/postcode_splitter/handler.py
index 1f453858..071ff6f9 100644
--- a/applications/postcode_splitter/handler.py
+++ b/applications/postcode_splitter/handler.py
@@ -12,8 +12,8 @@ from infrastructure.address2uprn_queue_client import Address2UprnQueueClient
 from infrastructure.csv_s3_client import CsvS3Client
 from orchestration.postcode_splitter_orchestrator import PostcodeSplitterOrchestrator
 from orchestration.task_orchestrator import TaskOrchestrator
-from repositories.raw_address.raw_address_csv_s3_repository import (
-    RawAddressCsvS3Repository,
+from repositories.raw_address.raw_address_list_csv_s3_repository import (
+    RawAddressListCsvS3Repository,
 )
 from utilities.aws_lambda.subtask_handler import subtask_handler
 
@@ -36,12 +36,12 @@ def handler(
     boto_sqs: Any = boto3_client("sqs")
 
     csv_client = CsvS3Client(boto_s3, bucket)
-    raw_address_repo = RawAddressCsvS3Repository(csv_client, bucket)
+    user_address_repo = RawAddressListCsvS3Repository(csv_client, bucket)
     queue_client = Address2UprnQueueClient(boto_sqs, queue_url)
 
     splitter = PostcodeSplitterOrchestrator(
         task_orchestrator=task_orchestrator,
-        raw_address_repo=raw_address_repo,
+        user_address_repo=user_address_repo,
         queue_client=queue_client,
     )
 
diff --git a/orchestration/postcode_splitter_orchestrator.py b/orchestration/postcode_splitter_orchestrator.py
index d1530e9f..20145524 100644
--- a/orchestration/postcode_splitter_orchestrator.py
+++ b/orchestration/postcode_splitter_orchestrator.py
@@ -5,7 +5,9 @@ from uuid import UUID
 from infrastructure.address2uprn_queue_client import Address2UprnQueueClient
 from orchestration.task_orchestrator import TaskOrchestrator
 from domain.addresses.postcode_batching import iter_postcode_grouped_batches
-from repositories.raw_address.raw_address_repository import RawAddressListRepository
+from repositories.raw_address.raw_address_list_repository import (
+    RawAddressListRepository,
+)
 
 
 class PostcodeSplitterOrchestrator:
diff --git a/orchestration/sal_orchestrator.py b/orchestration/sal_orchestrator.py
index 1154befc..f55947e7 100644
--- a/orchestration/sal_orchestrator.py
+++ b/orchestration/sal_orchestrator.py
@@ -1,4 +1,6 @@
-from repositories.raw_address.raw_address_repository import RawAddressListRepository
+from repositories.raw_address.raw_address_list_repository import (
+    RawAddressListRepository,
+)
 from domain.addresses.raw_address import AddressList
 
 
diff --git a/repositories/raw_address/raw_address_list_csv_s3_repository.py b/repositories/raw_address/raw_address_list_csv_s3_repository.py
index b0c2eec7..a636b17b 100644
--- a/repositories/raw_address/raw_address_list_csv_s3_repository.py
+++ b/repositories/raw_address/raw_address_list_csv_s3_repository.py
@@ -7,7 +7,9 @@ from typing import Optional
 from domain.addresses.raw_address import AddressList, RawAddress
 from domain.postcode import Postcode
 from infrastructure.csv_s3_client import CsvS3Client
-from repositories.raw_address.raw_address_repository import RawAddressListRepository
+from repositories.raw_address.raw_address_list_repository import (
+    RawAddressListRepository,
+)
 
 _ADDRESS_COLUMNS: tuple[str, str, str] = ("Address 1", "Address 2", "Address 3")
 _POSTCODE_COLUMN: str = "postcode"
diff --git a/tests/orchestration/test_landlord_description_overrides_orchestrator.py b/tests/orchestration/test_landlord_description_overrides_orchestrator.py
index bb79df6c..133d5b39 100644
--- a/tests/orchestration/test_landlord_description_overrides_orchestrator.py
+++ b/tests/orchestration/test_landlord_description_overrides_orchestrator.py
@@ -5,7 +5,9 @@ from domain.postcode import Postcode
 from orchestration.sal_orchestrator import (
     SALOrchestrator,
 )
-from repositories.raw_address.raw_address_repository import RawAddressListRepository
+from repositories.raw_address.raw_address_list_repository import (
+    RawAddressListRepository,
+)
 
 
 class _StubRawAddressRepository(RawAddressListRepository):
diff --git a/tests/orchestration/test_postcode_splitter_orchestrator.py b/tests/orchestration/test_postcode_splitter_orchestrator.py
index 0ce81781..1540112f 100644
--- a/tests/orchestration/test_postcode_splitter_orchestrator.py
+++ b/tests/orchestration/test_postcode_splitter_orchestrator.py
@@ -18,7 +18,7 @@ from orchestration.postcode_splitter_orchestrator import PostcodeSplitterOrchest
 from orchestration.task_orchestrator import TaskOrchestrator
 from repositories.tasks.subtask_postgres_repository import SubTaskPostgresRepository
 from repositories.tasks.task_postgres_repository import TaskPostgresRepository
-from repositories.raw_address.raw_address_csv_s3_repository import (
+from repositories.raw_address.raw_address_list_csv_s3_repository import (
     RawAddressListCsvS3Repository,
 )
 
diff --git a/tests/repositories/raw_address/test_raw_address_csv_s3_repository.py b/tests/repositories/raw_address/test_raw_address_list_csv_s3_repository.py
similarity index 98%
rename from tests/repositories/raw_address/test_raw_address_csv_s3_repository.py
rename to tests/repositories/raw_address/test_raw_address_list_csv_s3_repository.py
index 99284ec5..8870b29a 100644
--- a/tests/repositories/raw_address/test_raw_address_csv_s3_repository.py
+++ b/tests/repositories/raw_address/test_raw_address_list_csv_s3_repository.py
@@ -6,7 +6,7 @@ from moto import mock_aws
 from domain.addresses.raw_address import AddressList, RawAddress
 from domain.postcode import Postcode
 from infrastructure.csv_s3_client import CsvS3Client
-from repositories.raw_address.raw_address_csv_s3_repository import (
+from repositories.raw_address.raw_address_list_csv_s3_repository import (
     RawAddressListCsvS3Repository,
 )
 from tests.infrastructure import make_boto_client