diff --git a/src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs b/src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs
new file mode 100644
index 000000000..3f1046404
--- /dev/null
+++ b/src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs
@@ -0,0 +1,9 @@
+using System.Net.Http;
+
+namespace FilterLists.Agent.Core.Interfaces.Repositories
+{
+    public interface IListRepository
+    {
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Core/Interfaces/Services/IListService.cs b/src/FilterLists.Agent/Core/Interfaces/Services/IListService.cs
deleted file mode 100644
index 014f807da..000000000
--- a/src/FilterLists.Agent/Core/Interfaces/Services/IListService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Net.Http;
-
-namespace FilterLists.Agent.Core.Interfaces.Services
-{
-    public interface IListService
-    {
-        HttpClient HttpClient { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
index 69b288f44..f77923a94 100644
--- a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
@@ -32,8 +32,8 @@ public static void RegisterAgentServices(this IServiceCollection services)
             services.AddMediatR(AppDomain.CurrentDomain.GetAssemblies());
             services.AddSingleton<IFilterListsApiClient, FilterListsApiClient>();
             services.AddGitHubClient();
-            services.AddListService();
             services.AddUrlService();
+            services.AddListRepository();
             services.AddArchiveRepository();
             services.AddTransient<IListInfoRepository, ListInfoRepository>();
             services.AddTransient<IUrlRepository, UrlRepository>();
@@ -86,9 +86,9 @@ private static void AddGitHubClient(this IServiceCollection services)
             });
         }
 
-        private static void AddListService(this IServiceCollection services)
+        private static void AddUrlService(this IServiceCollection services)
         {
-            services.AddHttpClient<IListService, ListService>()
+            services.AddHttpClient<IUrlService, UrlService>()
                 .ConfigureHttpMessageHandlerBuilder(b =>
                 {
                     b.PrimaryHandler = new HttpClientHandler {AllowAutoRedirect = false};
@@ -99,9 +99,9 @@ private static void AddListService(this IServiceCollection services)
                         .WaitAndRetryAsync(5, i => i * TimeSpan.FromSeconds(3)));
         }
 
-        private static void AddUrlService(this IServiceCollection services)
+        private static void AddListRepository(this IServiceCollection services)
         {
-            services.AddHttpClient<IUrlService, UrlService>()
+            services.AddHttpClient<IListRepository, ListRepository>()
                 .ConfigureHttpMessageHandlerBuilder(b =>
                 {
                     b.PrimaryHandler = new HttpClientHandler {AllowAutoRedirect = false};
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
index 269c0559d..705dcf5b4 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Services;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using FilterLists.Agent.Extensions;
 using MediatR;
 using Microsoft.Extensions.Logging;
@@ -30,9 +30,9 @@ public class Handler : AsyncRequestHandler<Command>
             private readonly HttpClient _httpClient;
             private readonly ILogger<Handler> _logger;
 
-            public Handler(IListService listService, ILogger<Handler> logger)
+            public Handler(IListRepository listRepository, ILogger<Handler> logger)
             {
-                _httpClient = listService.HttpClient;
+                _httpClient = listRepository.HttpClient;
                 _logger = logger;
             }
 
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs b/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
index c297ea770..30be14ce2 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Services;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using MediatR;
 using Microsoft.Extensions.Logging;
 using SharpCompress.Archives;
@@ -30,9 +30,9 @@ public class Handler : AsyncRequestHandler<Command>
             private readonly HttpClient _httpClient;
             private readonly ILogger<Handler> _logger;
 
-            public Handler(IListService listService, ILogger<Handler> logger)
+            public Handler(IListRepository listRepository, ILogger<Handler> logger)
             {
-                _httpClient = listService.HttpClient;
+                _httpClient = listRepository.HttpClient;
                 _logger = logger;
             }
 
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs b/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
index e8d7c4c87..4c4aaabe9 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Services;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using MediatR;
 using Microsoft.Extensions.Logging;
 using SharpCompress.Common;
@@ -29,9 +29,9 @@ public class Handler : AsyncRequestHandler<Command>
             private readonly HttpClient _httpClient;
             private readonly ILogger<Handler> _logger;
 
-            public Handler(IListService listService, ILogger<Handler> logger)
+            public Handler(IListRepository listRepository, ILogger<Handler> logger)
             {
-                _httpClient = listService.HttpClient;
+                _httpClient = listRepository.HttpClient;
                 _logger = logger;
             }
 
diff --git a/src/FilterLists.Agent/Infrastructure/Services/ListService.cs b/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
similarity index 70%
rename from src/FilterLists.Agent/Infrastructure/Services/ListService.cs
rename to src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
index bb3057d29..25e33c521 100644
--- a/src/FilterLists.Agent/Infrastructure/Services/ListService.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using FilterLists.Agent.Core.Interfaces.Services;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Infrastructure.Services
+namespace FilterLists.Agent.Infrastructure.Repositories
 {
     [UsedImplicitly]
-    public class ListService : IListService
+    public class ListRepository : IListRepository
     {
-        public ListService(HttpClient client)
+        public ListRepository(HttpClient client)
         {
             client.Timeout = TimeSpan.FromSeconds(90);