diff --git a/client/DotNet/Armada.Client.Test/Tests.cs b/client/DotNet/Armada.Client.Test/Tests.cs
index 5a11261ce9a..b0abaad856c 100644
--- a/client/DotNet/Armada.Client.Test/Tests.cs
+++ b/client/DotNet/Armada.Client.Test/Tests.cs
@@ -15,7 +15,7 @@ public async Task TestSimpleJobSubmitFlow()
         {
             var jobSet = $"set-{Guid.NewGuid()}";
 
-            var client = new Client("http://localhost:8080", new HttpClient());
+            var client = new ArmadaClient("http://localhost:8080", new HttpClient());
             await client.CreateQueueAsync("test", new ApiQueue {PriorityFactor = 200});
 
             var pod = new V1PodSpec
diff --git a/client/DotNet/ArmadaClient.sln b/client/DotNet/Armada.Client.sln
similarity index 100%
rename from client/DotNet/ArmadaClient.sln
rename to client/DotNet/Armada.Client.sln
diff --git a/client/DotNet/Armada.Client/Armada.Client.csproj b/client/DotNet/Armada.Client/Armada.Client.csproj
index 5b65865f055..2830ee77d45 100644
--- a/client/DotNet/Armada.Client/Armada.Client.csproj
+++ b/client/DotNet/Armada.Client/Armada.Client.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <Target Name="NSwag" BeforeTargets="Build">
-    <Exec Command="$(NSwagExe_Core30) openapi2csclient /ProtectedMethods:Client.GetJobSetEventsAsync /classname:Client /namespace:GResearch.Armada.Client /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
+    <Exec Command="$(NSwagExe_Core30) openapi2csclient /ProtectedMethods:ArmadaClient.GetJobSetEventsAsync /classname:ArmadaClient /namespace:GResearch.Armada.Client /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
   </Target>
   
 </Project>
diff --git a/client/DotNet/Armada.Client/Client.cs b/client/DotNet/Armada.Client/Client.cs
index a1ce03707ae..1e6d5212137 100644
--- a/client/DotNet/Armada.Client/Client.cs
+++ b/client/DotNet/Armada.Client/Client.cs
@@ -12,7 +12,7 @@ public class StreamResponse<T>
         public string Error { get; set; }
     }
 
-    public partial class Client
+    public partial class ArmadaClient
     {
         public async Task<IEnumerable<StreamResponse<ApiEventStreamMessage>>> GetJobEventsStream(string jobSetId,
             string fromMessage = null, bool watch = false)
diff --git a/client/DotNet/Armada.Client/ClientGenerated.cs b/client/DotNet/Armada.Client/ClientGenerated.cs
index 13bf3f67f61..4ecd954bb16 100644
--- a/client/DotNet/Armada.Client/ClientGenerated.cs
+++ b/client/DotNet/Armada.Client/ClientGenerated.cs
@@ -15,13 +15,13 @@ namespace GResearch.Armada.Client
     using System = global::System;
     
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.1.3.0 (NJsonSchema v10.0.27.0 (Newtonsoft.Json v12.0.0.0))")]
-    public partial class Client 
+    public partial class ArmadaClient 
     {
         private string _baseUrl = "";
         private System.Net.Http.HttpClient _httpClient;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
     
-        public Client(string baseUrl, System.Net.Http.HttpClient httpClient)
+        public ArmadaClient(string baseUrl, System.Net.Http.HttpClient httpClient)
         {
             BaseUrl = baseUrl; 
             _httpClient = httpClient;