diff --git a/.dotnet/src/Custom/FineTuning/FineTuningClient.Protocol.cs b/.dotnet/src/Custom/FineTuning/FineTuningManagementClient.Protocol.cs
similarity index 97%
rename from .dotnet/src/Custom/FineTuning/FineTuningClient.Protocol.cs
rename to .dotnet/src/Custom/FineTuning/FineTuningManagementClient.Protocol.cs
index 3626eb6d1..d5450df4e 100644
--- a/.dotnet/src/Custom/FineTuning/FineTuningClient.Protocol.cs
+++ b/.dotnet/src/Custom/FineTuning/FineTuningManagementClient.Protocol.cs
@@ -2,9 +2,9 @@
 using System.ClientModel.Primitives;
 using System.Threading.Tasks;
 
-namespace OpenAI.FineTuning;
+namespace OpenAI.FineTuningManagement;
 
-public partial class FineTuningClient
+public partial class FineTuningManagementClient
 {
     /// <inheritdoc cref="Internal.FineTuning.CreateFineTuningJob(BinaryContent, RequestOptions)"/>
     public virtual ClientResult CreateFineTuningJob(
diff --git a/.dotnet/src/Custom/FineTuning/FineTuningClient.cs b/.dotnet/src/Custom/FineTuning/FineTuningManagementClient.cs
similarity index 88%
rename from .dotnet/src/Custom/FineTuning/FineTuningClient.cs
rename to .dotnet/src/Custom/FineTuning/FineTuningManagementClient.cs
index 7e1e6ea2e..7bb1a1220 100644
--- a/.dotnet/src/Custom/FineTuning/FineTuningClient.cs
+++ b/.dotnet/src/Custom/FineTuning/FineTuningManagementClient.cs
@@ -1,12 +1,12 @@
 using System;
 using System.ClientModel;
 
-namespace OpenAI.FineTuning;
+namespace OpenAI.FineTuningManagement;
 
 /// <summary>
 ///     The service client for OpenAI fine-tuning operations.
 /// </summary>
-public partial class FineTuningClient
+public partial class FineTuningManagementClient
 {
     private readonly OpenAIClientConnector _clientConnector;
     private Internal.FineTuning FineTuningShim => _clientConnector.InternalClient.GetFineTuningClient();
@@ -27,7 +27,7 @@ public partial class FineTuningClient
     /// <param name="endpoint">The connection endpoint to use.</param>
     /// <param name="credential">The API key used to authenticate with the service endpoint.</param>
     /// <param name="options">Additional options to customize the client.</param>
-    public FineTuningClient(Uri endpoint, ApiKeyCredential credential, OpenAIClientOptions options = null)
+    public FineTuningManagementClient(Uri endpoint, ApiKeyCredential credential, OpenAIClientOptions options = null)
     {
         _clientConnector = new("none", endpoint, credential, options);
     }
@@ -47,7 +47,7 @@ public FineTuningClient(Uri endpoint, ApiKeyCredential credential, OpenAIClientO
     /// </remarks>
     /// <param name="endpoint">The connection endpoint to use.</param>
     /// <param name="options">Additional options to customize the client.</param>
-    public FineTuningClient(Uri endpoint, OpenAIClientOptions options = null)
+    public FineTuningManagementClient(Uri endpoint, OpenAIClientOptions options = null)
         : this(endpoint, credential: null, options)
     { }
 
@@ -66,7 +66,7 @@ public FineTuningClient(Uri endpoint, OpenAIClientOptions options = null)
     /// </remarks>
     /// <param name="credential">The API key used to authenticate with the service endpoint.</param>
     /// <param name="options">Additional options to customize the client.</param>
-    public FineTuningClient(ApiKeyCredential credential, OpenAIClientOptions options = null)
+    public FineTuningManagementClient(ApiKeyCredential credential, OpenAIClientOptions options = null)
         : this(endpoint: null, credential, options)
     { }
 
@@ -84,7 +84,7 @@ public FineTuningClient(ApiKeyCredential credential, OpenAIClientOptions options
     /// </para>
     /// </remarks>
     /// <param name="options">Additional options to customize the client.</param>
-    public FineTuningClient(OpenAIClientOptions options = null)
+    public FineTuningManagementClient(OpenAIClientOptions options = null)
         : this(endpoint: null, credential: null, options)
     { }
 }
diff --git a/.dotnet/src/Custom/OpenAIClient.cs b/.dotnet/src/Custom/OpenAIClient.cs
index c42a64082..3971d594e 100644
--- a/.dotnet/src/Custom/OpenAIClient.cs
+++ b/.dotnet/src/Custom/OpenAIClient.cs
@@ -3,7 +3,7 @@
 using OpenAI.Chat;
 using OpenAI.Embeddings;
 using OpenAI.Files;
-using OpenAI.FineTuning;
+using OpenAI.FineTuningManagement;
 using OpenAI.Images;
 using OpenAI.LegacyCompletions;
 using OpenAI.ModelManagement;
@@ -143,15 +143,15 @@ public FileClient GetFileClient()
         => new(_cachedEndpoint, _cachedCredential, _cachedOptions);
 
     /// <summary>
-    /// Gets a new instance of <see cref="FineTuningClient"/> that reuses the client configuration details provided to
+    /// Gets a new instance of <see cref="FineTuningManagementClient"/> that reuses the client configuration details provided to
     /// the <see cref="OpenAIClient"/> instance.
     /// </summary>
     /// <remarks>
-    /// This method is functionally equivalent to using the <see cref="FineTuningClient"/> constructor directly with
+    /// This method is functionally equivalent to using the <see cref="FineTuningManagementClient"/> constructor directly with
     /// the same configuration details.
     /// </remarks>
-    /// <returns> A new <see cref="FineTuningClient"/>. </returns>
-    public FineTuningClient GetFineTuningClient()
+    /// <returns> A new <see cref="FineTuningManagementClient"/>. </returns>
+    public FineTuningManagementClient GetFineTuningManagementClient()
         => new(_cachedEndpoint, _cachedCredential, _cachedOptions);
 
     /// <summary>