diff --git a/atst/domain/csp/__init__.py b/atst/domain/csp/__init__.py
index d886f8a2..69eac768 100644
--- a/atst/domain/csp/__init__.py
+++ b/atst/domain/csp/__init__.py
@@ -1,5 +1,5 @@
 from .cloud import MockCloudProvider
-from .file_uploads import AzureUploader, MockUploader
+from .files import AzureFileService, MockFileService
 from .reports import MockReportingProvider
 
 
@@ -11,14 +11,14 @@ class MockCSP:
             with_failure=(not test_mode),
             with_authorization=(not test_mode),
         )
-        self.files = MockUploader(app)
+        self.files = MockFileService(app)
         self.reports = MockReportingProvider()
 
 
 class AzureCSP:
     def __init__(self, app):
         self.cloud = MockCloudProvider(app.config)
-        self.files = AzureUploader(app.config)
+        self.files = AzureFileService(app.config)
         self.reports = MockReportingProvider()
 
 
diff --git a/atst/domain/csp/file_uploads.py b/atst/domain/csp/files.py
similarity index 97%
rename from atst/domain/csp/file_uploads.py
rename to atst/domain/csp/files.py
index ce18df63..837cecbb 100644
--- a/atst/domain/csp/file_uploads.py
+++ b/atst/domain/csp/files.py
@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from uuid import uuid4
 
 
-class Uploader:
+class FileService:
     def generate_token(self):
         raise NotImplementedError()
 
@@ -16,7 +16,7 @@ class Uploader:
         raise NotImplementedError()
 
 
-class MockUploader(Uploader):
+class MockFileService(FileService):
     def __init__(self, config):
         self.config = config
 
@@ -34,7 +34,7 @@ class MockUploader(Uploader):
             }
 
 
-class AzureUploader(Uploader):
+class AzureFileService(FileService):
     def __init__(self, config):
         self.account_name = config["AZURE_ACCOUNT_NAME"]
         self.storage_key = config["AZURE_STORAGE_KEY"]
diff --git a/tests/domain/cloud/test_file_uploads.py b/tests/domain/cloud/test_azure_file_service.py
similarity index 70%
rename from tests/domain/cloud/test_file_uploads.py
rename to tests/domain/cloud/test_azure_file_service.py
index 9b1b0932..4eaf680c 100644
--- a/tests/domain/cloud/test_file_uploads.py
+++ b/tests/domain/cloud/test_azure_file_service.py
@@ -1,4 +1,4 @@
-from atst.domain.csp.file_uploads import AzureUploader
+from atst.domain.csp.files import AzureFileService
 from azure.storage.blob.models import Blob
 
 
@@ -14,9 +14,9 @@ class MockBlockBlobService(object):
 
 
 def test_download_task_order_success(app, monkeypatch):
-    uploader = AzureUploader(config=app.config)
-    uploader.BlockBlobService = MockBlockBlobService
+    file_service = AzureFileService(config=app.config)
+    file_service.BlockBlobService = MockBlockBlobService
 
-    task_order = uploader.download_task_order("test.pdf")
+    task_order = file_service.download_task_order("test.pdf")
     assert task_order["name"] == "test.pdf"
     assert task_order["content"] == b"mock content"