diff --git a/api/OpenAI.netstandard2.0.cs b/api/OpenAI.netstandard2.0.cs
index a67971fb..1a843e58 100644
--- a/api/OpenAI.netstandard2.0.cs
+++ b/api/OpenAI.netstandard2.0.cs
@@ -999,11 +999,11 @@ public class AudioClient {
         public AudioClient(string model, ApiKeyCredential credential);
         public virtual ClientPipeline Pipeline { get; }
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual ClientResult GenerateSpeechFromText(BinaryContent content, RequestOptions options = null);
-        public virtual ClientResult<BinaryData> GenerateSpeechFromText(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default);
+        public virtual ClientResult GenerateSpeech(BinaryContent content, RequestOptions options = null);
+        public virtual ClientResult<BinaryData> GenerateSpeech(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default);
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual Task<ClientResult> GenerateSpeechFromTextAsync(BinaryContent content, RequestOptions options = null);
-        public virtual Task<ClientResult<BinaryData>> GenerateSpeechFromTextAsync(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default);
+        public virtual Task<ClientResult> GenerateSpeechAsync(BinaryContent content, RequestOptions options = null);
+        public virtual Task<ClientResult<BinaryData>> GenerateSpeechAsync(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default);
         [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual ClientResult TranscribeAudio(BinaryContent content, string contentType, RequestOptions options = null);
         public virtual ClientResult<AudioTranscription> TranscribeAudio(Stream audio, string audioFilename, AudioTranscriptionOptions options = null, CancellationToken cancellationToken = default);
@@ -1720,7 +1720,7 @@ public class OpenAIFileInfo : IJsonModel<OpenAIFileInfo>, IPersistableModel<Open
         public string Filename { get; }
         public string Id { get; }
         public OpenAIFilePurpose Purpose { get; }
-        public long? SizeInBytes { get; }
+        public int? SizeInBytes { get; }
         public OpenAIFileStatus Status { get; }
         public string StatusDetails { get; }
         OpenAIFileInfo IJsonModel<OpenAIFileInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
@@ -1758,7 +1758,7 @@ public class OpenAIFileInfoCollection : ObjectModel.ReadOnlyCollection<OpenAIFil
         public override readonly string ToString();
     }
     public static class OpenAIFilesModelFactory {
-        public static OpenAIFileInfo OpenAIFileInfo(string id = null, long? sizeInBytes = null, DateTimeOffset createdAt = default, string filename = null, OpenAIFilePurpose purpose = default, OpenAIFileStatus status = default, string statusDetails = null);
+        public static OpenAIFileInfo OpenAIFileInfo(string id = null, int? sizeInBytes = null, DateTimeOffset createdAt = default, string filename = null, OpenAIFilePurpose purpose = default, OpenAIFileStatus status = default, string statusDetails = null);
         public static OpenAIFileInfoCollection OpenAIFileInfoCollection(IEnumerable<OpenAIFileInfo> items = null);
     }
     public readonly partial struct OpenAIFileStatus : IEquatable<OpenAIFileStatus> {
diff --git a/examples/Audio/Example01_SimpleTextToSpeech.cs b/examples/Audio/Example01_SimpleTextToSpeech.cs
index 79b8ac12..8573152f 100644
--- a/examples/Audio/Example01_SimpleTextToSpeech.cs
+++ b/examples/Audio/Example01_SimpleTextToSpeech.cs
@@ -18,7 +18,7 @@ public void Example01_SimpleTextToSpeech()
             + " moisture, it is wise to postpone watering for a couple more days. When in doubt, it is often safer"
             + " to water sparingly and maintain a less-is-more approach.";
 
-        BinaryData speech = client.GenerateSpeechFromText(input, GeneratedSpeechVoice.Alloy);
+        BinaryData speech = client.GenerateSpeech(input, GeneratedSpeechVoice.Alloy);
 
         using FileStream stream = File.OpenWrite($"{Guid.NewGuid()}.mp3");
         speech.ToStream().CopyTo(stream);
diff --git a/examples/Audio/Example01_SimpleTextToSpeechAsync.cs b/examples/Audio/Example01_SimpleTextToSpeechAsync.cs
index ae8432eb..7226ae73 100644
--- a/examples/Audio/Example01_SimpleTextToSpeechAsync.cs
+++ b/examples/Audio/Example01_SimpleTextToSpeechAsync.cs
@@ -19,7 +19,7 @@ public async Task Example01_SimpleTextToSpeechAsync()
             + " moisture, it is wise to postpone watering for a couple more days. When in doubt, it is often safer"
             + " to water sparingly and maintain a less-is-more approach.";
 
-        BinaryData speech = await client.GenerateSpeechFromTextAsync(input, GeneratedSpeechVoice.Alloy);
+        BinaryData speech = await client.GenerateSpeechAsync(input, GeneratedSpeechVoice.Alloy);
 
         using FileStream stream = File.OpenWrite($"{Guid.NewGuid()}.mp3");
         speech.ToStream().CopyTo(stream);
diff --git a/examples/CombinationExamples.cs b/examples/CombinationExamples.cs
index c4b460b1..7987d81f 100644
--- a/examples/CombinationExamples.cs
+++ b/examples/CombinationExamples.cs
@@ -48,7 +48,7 @@ public void AlpacaArtAssessor()
 
         // Finally, we'll get some text-to-speech for that critical evaluation using tts-1-hd:
         AudioClient audioClient = new("tts-1-hd", Environment.GetEnvironmentVariable("OPENAI_API_KEY"));
-        ClientResult<BinaryData> ttsResult = audioClient.GenerateSpeechFromText(
+        ClientResult<BinaryData> ttsResult = audioClient.GenerateSpeech(
             text: chatResponseText,
             GeneratedSpeechVoice.Fable,
             new SpeechGenerationOptions()
@@ -84,7 +84,7 @@ public async Task CuriousCreatureCreator()
 
         // Asynchronously, in parallel to the next steps, we'll get the creative description in the voice of Onyx
         AudioClient ttsClient = new("tts-1-hd", Environment.GetEnvironmentVariable("OPENAI_API_KEY"));
-        Task<ClientResult<BinaryData>> imageDescriptionAudioTask = ttsClient.GenerateSpeechFromTextAsync(
+        Task<ClientResult<BinaryData>> imageDescriptionAudioTask = ttsClient.GenerateSpeechAsync(
             description,
             GeneratedSpeechVoice.Onyx,
             new SpeechGenerationOptions()
@@ -131,7 +131,7 @@ public async Task CuriousCreatureCreator()
         Console.WriteLine($"Critic's appraisal:\n{appraisal}");
 
         // Finally, we'll get that art expert's laudations in the voice of Fable
-        ClientResult<BinaryData> appraisalAudioResult = await ttsClient.GenerateSpeechFromTextAsync(
+        ClientResult<BinaryData> appraisalAudioResult = await ttsClient.GenerateSpeechAsync(
             appraisal,
             GeneratedSpeechVoice.Fable,
             new SpeechGenerationOptions()
diff --git a/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs
index 66019bbb..7f970fec 100644
--- a/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs
+++ b/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs
@@ -107,7 +107,7 @@ private PipelineMessage CreateGetAssistantsRequest(int? limit, string order, str
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/assistants", false);
+        uri.AppendPath("/v1/assistants", false);
         if (limit != null)
         {
             uri.AppendQuery("limit", limit.Value, true);
diff --git a/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs
index 53e09fec..860bfbe0 100644
--- a/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs
+++ b/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs
@@ -115,7 +115,7 @@ private PipelineMessage CreateGetMessagesRequest(string threadId, int? limit, st
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/threads/", false);
+        uri.AppendPath("/v1/threads/", false);
         uri.AppendPath(threadId, true);
         uri.AppendPath("/messages", false);
         if (limit != null)
diff --git a/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs
index b5992ce7..1245c476 100644
--- a/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs
+++ b/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs
@@ -119,7 +119,7 @@ private PipelineMessage CreateGetRunStepsRequest(string threadId, string runId,
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/threads/", false);
+        uri.AppendPath("/v1/threads/", false);
         uri.AppendPath(threadId, true);
         uri.AppendPath("/runs/", false);
         uri.AppendPath(runId, true);
diff --git a/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs
index f48ceb3c..879f389b 100644
--- a/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs
+++ b/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs
@@ -113,7 +113,7 @@ private PipelineMessage CreateGetRunsRequest(string threadId, int? limit, string
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/threads/", false);
+        uri.AppendPath("/v1/threads/", false);
         uri.AppendPath(threadId, true);
         uri.AppendPath("/runs", false);
         if (limit != null)
diff --git a/src/Custom/Audio/AudioClient.Protocol.cs b/src/Custom/Audio/AudioClient.Protocol.cs
index ba000162..0fd68c69 100644
--- a/src/Custom/Audio/AudioClient.Protocol.cs
+++ b/src/Custom/Audio/AudioClient.Protocol.cs
@@ -27,7 +27,7 @@ public partial class AudioClient
     /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
     /// <returns> The response returned from the service. </returns>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public virtual async Task<ClientResult> GenerateSpeechFromTextAsync(BinaryContent content, RequestOptions options = null)
+    public virtual async Task<ClientResult> GenerateSpeechAsync(BinaryContent content, RequestOptions options = null)
     {
         Argument.AssertNotNull(content, nameof(content));
 
@@ -48,7 +48,7 @@ public virtual async Task<ClientResult> GenerateSpeechFromTextAsync(BinaryConten
     /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
     /// <returns> The response returned from the service. </returns>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public virtual ClientResult GenerateSpeechFromText(BinaryContent content, RequestOptions options = null)
+    public virtual ClientResult GenerateSpeech(BinaryContent content, RequestOptions options = null)
     {
         Argument.AssertNotNull(content, nameof(content));
 
diff --git a/src/Custom/Audio/AudioClient.cs b/src/Custom/Audio/AudioClient.cs
index fff3bc7d..58c0e49a 100644
--- a/src/Custom/Audio/AudioClient.cs
+++ b/src/Custom/Audio/AudioClient.cs
@@ -93,7 +93,7 @@ protected internal AudioClient(ClientPipeline pipeline, string model, OpenAIClie
     /// <param name="cancellationToken"> A token that can be used to cancel this method call. </param>
     /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
     /// <returns> The generated audio in the specified output format. </returns>
-    public virtual async Task<ClientResult<BinaryData>> GenerateSpeechFromTextAsync(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default)
+    public virtual async Task<ClientResult<BinaryData>> GenerateSpeechAsync(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default)
     {
         Argument.AssertNotNull(text, nameof(text));
 
@@ -101,7 +101,7 @@ public virtual async Task<ClientResult<BinaryData>> GenerateSpeechFromTextAsync(
         CreateSpeechGenerationOptions(text, voice, ref options);
 
         using BinaryContent content = options.ToBinaryContent();
-        ClientResult result = await GenerateSpeechFromTextAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false);
+        ClientResult result = await GenerateSpeechAsync(content, cancellationToken.ToRequestOptions()).ConfigureAwait(false);
         return ClientResult.FromValue(result.GetRawResponse().Content, result.GetRawResponse());
     }
 
@@ -116,7 +116,7 @@ public virtual async Task<ClientResult<BinaryData>> GenerateSpeechFromTextAsync(
     /// <param name="cancellationToken"> A token that can be used to cancel this method call. </param>
     /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
     /// <returns> The generated audio in the specified output format. </returns>
-    public virtual ClientResult<BinaryData> GenerateSpeechFromText(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default)
+    public virtual ClientResult<BinaryData> GenerateSpeech(string text, GeneratedSpeechVoice voice, SpeechGenerationOptions options = null, CancellationToken cancellationToken = default)
     {
         Argument.AssertNotNull(text, nameof(text));
 
@@ -124,7 +124,7 @@ public virtual ClientResult<BinaryData> GenerateSpeechFromText(string text, Gene
         CreateSpeechGenerationOptions(text, voice, ref options);
 
         using BinaryContent content = options.ToBinaryContent();
-        ClientResult result = GenerateSpeechFromText(content, cancellationToken.ToRequestOptions()); ;
+        ClientResult result = GenerateSpeech(content, cancellationToken.ToRequestOptions()); ;
         return ClientResult.FromValue(result.GetRawResponse().Content, result.GetRawResponse());
     }
 
diff --git a/src/Custom/Files/OpenAIFileInfo.cs b/src/Custom/Files/OpenAIFileInfo.cs
index 0067c479..17f0d479 100644
--- a/src/Custom/Files/OpenAIFileInfo.cs
+++ b/src/Custom/Files/OpenAIFileInfo.cs
@@ -10,5 +10,5 @@ public partial class OpenAIFileInfo
     // CUSTOM: Renamed.
     /// <summary> The size of the file, in bytes. </summary>
     [CodeGenMember("Bytes")]
-    public long? SizeInBytes { get; }
+    public int? SizeInBytes { get; }
 }
diff --git a/src/Custom/Files/OpenAIFilesModelFactory.cs b/src/Custom/Files/OpenAIFilesModelFactory.cs
index 0d79b520..41c13090 100644
--- a/src/Custom/Files/OpenAIFilesModelFactory.cs
+++ b/src/Custom/Files/OpenAIFilesModelFactory.cs
@@ -9,7 +9,7 @@ public static partial class OpenAIFilesModelFactory
 {
     /// <summary> Initializes a new instance of <see cref="OpenAI.Files.OpenAIFileInfo"/>. </summary>
     /// <returns> A new <see cref="OpenAI.Files.OpenAIFileInfo"/> instance for mocking. </returns>
-    public static OpenAIFileInfo OpenAIFileInfo(string id = null, long? sizeInBytes = null, DateTimeOffset createdAt = default, string filename = null, OpenAIFilePurpose purpose = default, OpenAIFileStatus status = default, string statusDetails = null)
+    public static OpenAIFileInfo OpenAIFileInfo(string id = null, int? sizeInBytes = null, DateTimeOffset createdAt = default, string filename = null, OpenAIFilePurpose purpose = default, OpenAIFileStatus status = default, string statusDetails = null)
     {
         return new OpenAIFileInfo(
             id,
diff --git a/src/Custom/OpenAIClient.cs b/src/Custom/OpenAIClient.cs
index 3518a18e..45e4e275 100644
--- a/src/Custom/OpenAIClient.cs
+++ b/src/Custom/OpenAIClient.cs
@@ -61,7 +61,7 @@ namespace OpenAI;
 [CodeGenSuppress("GetVectorStoreClientClient")]
 public partial class OpenAIClient
 {
-    private const string OpenAIV1Endpoint = "https://api.openai.com/v1";
+    private const string OpenAIV1Endpoint = "https://api.openai.com";
     private const string OpenAIBetaHeaderValue = "assistants=v2";
 
     private static class KnownHeaderNames
@@ -98,6 +98,7 @@ public OpenAIClient(ApiKeyCredential credential, OpenAIClientOptions options)
 
         _pipeline = OpenAIClient.CreatePipeline(credential, options);
         _endpoint = OpenAIClient.GetEndpoint(options);
+        _options = options;
     }
 
     // CUSTOM: Added protected internal constructor that takes a ClientPipeline.
diff --git a/src/Custom/OpenAIClientOptions.cs b/src/Custom/OpenAIClientOptions.cs
index 81efabbd..396cbf0b 100644
--- a/src/Custom/OpenAIClientOptions.cs
+++ b/src/Custom/OpenAIClientOptions.cs
@@ -3,29 +3,71 @@
 
 namespace OpenAI;
 
-/// <summary>
-/// Client-level options for the OpenAI service.
-/// </summary>
+/// <summary> The options to configure the client. </summary>
 [CodeGenModel("OpenAIClientOptions")]
 public partial class OpenAIClientOptions : ClientPipelineOptions
 {
+    private Uri _endpoint;
+    private string _organizationId;
+    private string _projectId;
+    private string _applicationId;
+
     /// <summary>
-    /// A non-default base endpoint that clients should use when connecting.
+    /// The service endpoint that the client will send requests to. If not set, the default endpoint will be used.
     /// </summary>
-    public Uri Endpoint { get; set; }
+    public Uri Endpoint
+    {
+        get => _endpoint;
+        set
+        {
+            AssertNotFrozen();
+            _endpoint = value;
+        }
+    }
 
     /// <summary>
-    /// An optional application ID to use as part of the request User-Agent header.
+    /// The value to use for the <c>OpenAI-Organization</c> request header. Users who belong to multiple organizations
+    /// can set this value to specify which organization is used for an API request. Usage from these API requests will
+    /// count against the specified organization's quota. If not set, the header will be omitted, and the default
+    /// organization will be billed. You can change your default organization in your user settings.
+    /// <see href="https://platform.openai.com/docs/guides/production-best-practices/setting-up-your-organization">Learn more</see>.
     /// </summary>
-    public string ApplicationId { get; set; }
+    public string OrganizationId
+    {
+        get => _organizationId;
+        set
+        {
+            AssertNotFrozen();
+            _organizationId = value;
+        }
+    }
 
     /// <summary>
-    /// An optional ID added to OpenAI-Organization header
+    /// The value to use for the <c>OpenAI-Project</c> request header. Users who are accessing their projects through
+    /// their legacy user API key can set this value to specify which project is used for an API request. Usage from
+    /// these API requests will count as usage for the specified project. If not set, the header will be omitted, and
+    /// the default project will be accessed.
     /// </summary>
-    public string OrganizationId { get; set; }
+    public string ProjectId
+    {
+        get => _projectId;
+        set
+        {
+            AssertNotFrozen();
+            _projectId = value;
+        }
+    }
 
     /// <summary>
-    /// An optional ID added to OpenAI-Project header
+    /// An optional application ID to use as part of the request User-Agent header.
     /// </summary>
-    public string ProjectId { get; set; }
+    public string ApplicationId
+    {
+        get => _applicationId;
+        set
+        {
+            AssertNotFrozen();
+            _applicationId = value;
+        }
+    }
 }
diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs
index 1445485d..3212db4d 100644
--- a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs
+++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs
@@ -121,7 +121,7 @@ internal PipelineMessage CreateGetFilesInVectorStoreBatchesRequest(string vector
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/vector_stores/", false);
+        uri.AppendPath("/v1/vector_stores/", false);
         uri.AppendPath(vectorStoreId, true);
         uri.AppendPath("/file_batches/", false);
         uri.AppendPath(batchId, true);
diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs
index 9a5e9bec..81506b05 100644
--- a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs
+++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs
@@ -116,7 +116,7 @@ internal PipelineMessage CreateGetVectorStoreFilesRequest(string vectorStoreId,
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/vector_stores/", false);
+        uri.AppendPath("/v1/vector_stores/", false);
         uri.AppendPath(vectorStoreId, true);
         uri.AppendPath("/files", false);
         if (limit != null)
diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs
index 311a8837..d3416a3b 100644
--- a/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs
+++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs
@@ -106,7 +106,7 @@ internal PipelineMessage CreateGetVectorStoresRequest(int? limit, string order,
         request.Method = "GET";
         var uri = new ClientUriBuilder();
         uri.Reset(_endpoint);
-        uri.AppendPath("/vector_stores", false);
+        uri.AppendPath("/v1/vector_stores", false);
         if (limit != null)
         {
             uri.AppendQuery("limit", limit.Value, true);
diff --git a/src/Generated/AssistantClient.cs b/src/Generated/AssistantClient.cs
index 14c304e8..3e5a40f5 100644
--- a/src/Generated/AssistantClient.cs
+++ b/src/Generated/AssistantClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateAssistantRequest(BinaryContent content, Req
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/assistants", false);
+            uri.AppendPath("/v1/assistants", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -49,7 +49,7 @@ internal PipelineMessage CreateGetAssistantsRequest(int? limit, string order, st
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/assistants", false);
+            uri.AppendPath("/v1/assistants", false);
             if (limit != null)
             {
                 uri.AppendQuery("limit", limit.Value, true);
@@ -80,7 +80,7 @@ internal PipelineMessage CreateGetAssistantRequest(string assistantId, RequestOp
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/assistants/", false);
+            uri.AppendPath("/v1/assistants/", false);
             uri.AppendPath(assistantId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -96,7 +96,7 @@ internal PipelineMessage CreateModifyAssistantRequest(string assistantId, Binary
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/assistants/", false);
+            uri.AppendPath("/v1/assistants/", false);
             uri.AppendPath(assistantId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -114,7 +114,7 @@ internal PipelineMessage CreateDeleteAssistantRequest(string assistantId, Reques
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/assistants/", false);
+            uri.AppendPath("/v1/assistants/", false);
             uri.AppendPath(assistantId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
diff --git a/src/Generated/AudioClient.cs b/src/Generated/AudioClient.cs
index 8b5a4f1d..6022edc5 100644
--- a/src/Generated/AudioClient.cs
+++ b/src/Generated/AudioClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateSpeechRequest(BinaryContent content, Reques
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/audio/speech", false);
+            uri.AppendPath("/v1/audio/speech", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/octet-stream");
             request.Headers.Set("Content-Type", "application/json");
@@ -49,7 +49,7 @@ internal PipelineMessage CreateCreateTranscriptionRequest(BinaryContent content,
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/audio/transcriptions", false);
+            uri.AppendPath("/v1/audio/transcriptions", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", contentType);
@@ -66,7 +66,7 @@ internal PipelineMessage CreateCreateTranslationRequest(BinaryContent content, s
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/audio/translations", false);
+            uri.AppendPath("/v1/audio/translations", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", contentType);
diff --git a/src/Generated/BatchClient.cs b/src/Generated/BatchClient.cs
index 3ccd2f90..2b43e1b0 100644
--- a/src/Generated/BatchClient.cs
+++ b/src/Generated/BatchClient.cs
@@ -33,7 +33,7 @@ internal PipelineMessage CreateCreateBatchRequest(BinaryContent content, Request
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/batches", false);
+            uri.AppendPath("/v1/batches", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -50,7 +50,7 @@ internal PipelineMessage CreateGetBatchesRequest(string after, int? limit, Reque
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/batches", false);
+            uri.AppendPath("/v1/batches", false);
             if (after != null)
             {
                 uri.AppendQuery("after", after, true);
@@ -73,7 +73,7 @@ internal PipelineMessage CreateRetrieveBatchRequest(string batchId, RequestOptio
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/batches/", false);
+            uri.AppendPath("/v1/batches/", false);
             uri.AppendPath(batchId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -89,7 +89,7 @@ internal PipelineMessage CreateCancelBatchRequest(string batchId, RequestOptions
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/batches/", false);
+            uri.AppendPath("/v1/batches/", false);
             uri.AppendPath(batchId, true);
             uri.AppendPath("/cancel", false);
             request.Uri = uri.ToUri();
diff --git a/src/Generated/ChatClient.cs b/src/Generated/ChatClient.cs
index 6db94d5e..b27f0ede 100644
--- a/src/Generated/ChatClient.cs
+++ b/src/Generated/ChatClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateChatCompletionRequest(BinaryContent content
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/chat/completions", false);
+            uri.AppendPath("/v1/chat/completions", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
diff --git a/src/Generated/EmbeddingClient.cs b/src/Generated/EmbeddingClient.cs
index e93cade4..00352b85 100644
--- a/src/Generated/EmbeddingClient.cs
+++ b/src/Generated/EmbeddingClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateEmbeddingRequest(BinaryContent content, Req
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/embeddings", false);
+            uri.AppendPath("/v1/embeddings", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
diff --git a/src/Generated/FileClient.cs b/src/Generated/FileClient.cs
index 131f6ba5..bfb518a3 100644
--- a/src/Generated/FileClient.cs
+++ b/src/Generated/FileClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateFileRequest(BinaryContent content, string c
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/files", false);
+            uri.AppendPath("/v1/files", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", contentType);
@@ -49,7 +49,7 @@ internal PipelineMessage CreateGetFilesRequest(string purpose, RequestOptions op
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/files", false);
+            uri.AppendPath("/v1/files", false);
             if (purpose != null)
             {
                 uri.AppendQuery("purpose", purpose, true);
@@ -68,7 +68,7 @@ internal PipelineMessage CreateRetrieveFileRequest(string fileId, RequestOptions
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/files/", false);
+            uri.AppendPath("/v1/files/", false);
             uri.AppendPath(fileId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -84,7 +84,7 @@ internal PipelineMessage CreateDeleteFileRequest(string fileId, RequestOptions o
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/files/", false);
+            uri.AppendPath("/v1/files/", false);
             uri.AppendPath(fileId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -100,7 +100,7 @@ internal PipelineMessage CreateDownloadFileRequest(string fileId, RequestOptions
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/files/", false);
+            uri.AppendPath("/v1/files/", false);
             uri.AppendPath(fileId, true);
             uri.AppendPath("/content", false);
             request.Uri = uri.ToUri();
diff --git a/src/Generated/FineTuningClient.cs b/src/Generated/FineTuningClient.cs
index c4446699..fe4998f4 100644
--- a/src/Generated/FineTuningClient.cs
+++ b/src/Generated/FineTuningClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateFineTuningJobRequest(BinaryContent content,
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs", false);
+            uri.AppendPath("/v1/fine_tuning/jobs", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -49,7 +49,7 @@ internal PipelineMessage CreateGetPaginatedFineTuningJobsRequest(string after, i
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs", false);
+            uri.AppendPath("/v1/fine_tuning/jobs", false);
             if (after != null)
             {
                 uri.AppendQuery("after", after, true);
@@ -72,7 +72,7 @@ internal PipelineMessage CreateRetrieveFineTuningJobRequest(string fineTuningJob
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs/", false);
+            uri.AppendPath("/v1/fine_tuning/jobs/", false);
             uri.AppendPath(fineTuningJobId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -88,7 +88,7 @@ internal PipelineMessage CreateCancelFineTuningJobRequest(string fineTuningJobId
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs/", false);
+            uri.AppendPath("/v1/fine_tuning/jobs/", false);
             uri.AppendPath(fineTuningJobId, true);
             uri.AppendPath("/cancel", false);
             request.Uri = uri.ToUri();
@@ -105,7 +105,7 @@ internal PipelineMessage CreateGetFineTuningJobCheckpointsRequest(string fineTun
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs/", false);
+            uri.AppendPath("/v1/fine_tuning/jobs/", false);
             uri.AppendPath(fineTuningJobId, true);
             uri.AppendPath("/checkpoints", false);
             if (after != null)
@@ -130,7 +130,7 @@ internal PipelineMessage CreateGetFineTuningEventsRequest(string fineTuningJobId
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/fine_tuning/jobs/", false);
+            uri.AppendPath("/v1/fine_tuning/jobs/", false);
             uri.AppendPath(fineTuningJobId, true);
             uri.AppendPath("/events", false);
             if (after != null)
diff --git a/src/Generated/ImageClient.cs b/src/Generated/ImageClient.cs
index 6e0558f0..cab97e7f 100644
--- a/src/Generated/ImageClient.cs
+++ b/src/Generated/ImageClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateImageRequest(BinaryContent content, Request
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/images/generations", false);
+            uri.AppendPath("/v1/images/generations", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -49,7 +49,7 @@ internal PipelineMessage CreateCreateImageEditRequest(BinaryContent content, str
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/images/edits", false);
+            uri.AppendPath("/v1/images/edits", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", contentType);
@@ -66,7 +66,7 @@ internal PipelineMessage CreateCreateImageVariationRequest(BinaryContent content
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/images/variations", false);
+            uri.AppendPath("/v1/images/variations", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", contentType);
diff --git a/src/Generated/InternalAssistantMessageClient.cs b/src/Generated/InternalAssistantMessageClient.cs
index 5ad0ce02..5b211af7 100644
--- a/src/Generated/InternalAssistantMessageClient.cs
+++ b/src/Generated/InternalAssistantMessageClient.cs
@@ -48,7 +48,7 @@ internal PipelineMessage CreateCreateMessageRequest(string threadId, BinaryConte
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/messages", false);
             request.Uri = uri.ToUri();
@@ -67,7 +67,7 @@ internal PipelineMessage CreateGetMessagesRequest(string threadId, int? limit, s
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/messages", false);
             if (limit != null)
@@ -100,7 +100,7 @@ internal PipelineMessage CreateGetMessageRequest(string threadId, string message
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/messages/", false);
             uri.AppendPath(messageId, true);
@@ -118,7 +118,7 @@ internal PipelineMessage CreateModifyMessageRequest(string threadId, string mess
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/messages/", false);
             uri.AppendPath(messageId, true);
@@ -138,7 +138,7 @@ internal PipelineMessage CreateDeleteMessageRequest(string threadId, string mess
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/messages/", false);
             uri.AppendPath(messageId, true);
diff --git a/src/Generated/InternalAssistantRunClient.cs b/src/Generated/InternalAssistantRunClient.cs
index b079a8a5..2a6b2de9 100644
--- a/src/Generated/InternalAssistantRunClient.cs
+++ b/src/Generated/InternalAssistantRunClient.cs
@@ -66,7 +66,7 @@ internal PipelineMessage CreateCreateThreadAndRunRequest(BinaryContent content,
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/runs", false);
+            uri.AppendPath("/v1/threads/runs", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -83,7 +83,7 @@ internal PipelineMessage CreateCreateRunRequest(string threadId, BinaryContent c
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs", false);
             request.Uri = uri.ToUri();
@@ -102,7 +102,7 @@ internal PipelineMessage CreateGetRunsRequest(string threadId, int? limit, strin
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs", false);
             if (limit != null)
@@ -135,7 +135,7 @@ internal PipelineMessage CreateGetRunRequest(string threadId, string runId, Requ
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
@@ -153,7 +153,7 @@ internal PipelineMessage CreateModifyRunRequest(string threadId, string runId, B
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
@@ -173,7 +173,7 @@ internal PipelineMessage CreateCancelRunRequest(string threadId, string runId, R
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
@@ -192,7 +192,7 @@ internal PipelineMessage CreateSubmitToolOutputsToRunRequest(string threadId, st
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
@@ -213,7 +213,7 @@ internal PipelineMessage CreateGetRunStepsRequest(string threadId, string runId,
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
@@ -248,7 +248,7 @@ internal PipelineMessage CreateGetRunStepRequest(string threadId, string runId,
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             uri.AppendPath("/runs/", false);
             uri.AppendPath(runId, true);
diff --git a/src/Generated/InternalAssistantThreadClient.cs b/src/Generated/InternalAssistantThreadClient.cs
index 347ef4bd..9bba60ad 100644
--- a/src/Generated/InternalAssistantThreadClient.cs
+++ b/src/Generated/InternalAssistantThreadClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateThreadRequest(BinaryContent content, Reques
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads", false);
+            uri.AppendPath("/v1/threads", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -49,7 +49,7 @@ internal PipelineMessage CreateGetThreadRequest(string threadId, RequestOptions
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -65,7 +65,7 @@ internal PipelineMessage CreateModifyThreadRequest(string threadId, BinaryConten
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -83,7 +83,7 @@ internal PipelineMessage CreateDeleteThreadRequest(string threadId, RequestOptio
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/threads/", false);
+            uri.AppendPath("/v1/threads/", false);
             uri.AppendPath(threadId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
diff --git a/src/Generated/InternalUploadsClient.cs b/src/Generated/InternalUploadsClient.cs
index 4c6d033a..0e30e2f4 100644
--- a/src/Generated/InternalUploadsClient.cs
+++ b/src/Generated/InternalUploadsClient.cs
@@ -174,7 +174,7 @@ internal PipelineMessage CreateCreateUploadRequest(BinaryContent content, Reques
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/uploads", false);
+            uri.AppendPath("/v1/uploads", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -191,7 +191,7 @@ internal PipelineMessage CreateAddUploadPartRequest(string uploadId, BinaryConte
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/uploads/", false);
+            uri.AppendPath("/v1/uploads/", false);
             uri.AppendPath(uploadId, true);
             uri.AppendPath("/parts", false);
             request.Uri = uri.ToUri();
@@ -210,7 +210,7 @@ internal PipelineMessage CreateCompleteUploadRequest(string uploadId, BinaryCont
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/uploads/", false);
+            uri.AppendPath("/v1/uploads/", false);
             uri.AppendPath(uploadId, true);
             uri.AppendPath("/complete", false);
             request.Uri = uri.ToUri();
@@ -229,7 +229,7 @@ internal PipelineMessage CreateCancelUploadRequest(string uploadId, RequestOptio
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/uploads/", false);
+            uri.AppendPath("/v1/uploads/", false);
             uri.AppendPath(uploadId, true);
             uri.AppendPath("/cancel", false);
             request.Uri = uri.ToUri();
diff --git a/src/Generated/LegacyCompletionClient.cs b/src/Generated/LegacyCompletionClient.cs
index efb44faa..4a0ad7e2 100644
--- a/src/Generated/LegacyCompletionClient.cs
+++ b/src/Generated/LegacyCompletionClient.cs
@@ -66,7 +66,7 @@ internal PipelineMessage CreateCreateCompletionRequest(BinaryContent content, Re
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/completions", false);
+            uri.AppendPath("/v1/completions", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
diff --git a/src/Generated/ModelClient.cs b/src/Generated/ModelClient.cs
index 86aef48f..62db6d53 100644
--- a/src/Generated/ModelClient.cs
+++ b/src/Generated/ModelClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateGetModelsRequest(RequestOptions options)
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/models", false);
+            uri.AppendPath("/v1/models", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             message.Apply(options);
@@ -47,7 +47,7 @@ internal PipelineMessage CreateRetrieveRequest(string model, RequestOptions opti
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/models/", false);
+            uri.AppendPath("/v1/models/", false);
             uri.AppendPath(model, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -63,7 +63,7 @@ internal PipelineMessage CreateDeleteRequest(string model, RequestOptions option
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/models/", false);
+            uri.AppendPath("/v1/models/", false);
             uri.AppendPath(model, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
diff --git a/src/Generated/Models/OpenAIFileInfo.Serialization.cs b/src/Generated/Models/OpenAIFileInfo.Serialization.cs
index 18fbf44d..fcd6544a 100644
--- a/src/Generated/Models/OpenAIFileInfo.Serialization.cs
+++ b/src/Generated/Models/OpenAIFileInfo.Serialization.cs
@@ -111,7 +111,7 @@ internal static OpenAIFileInfo DeserializeOpenAIFileInfo(JsonElement element, Mo
                 return null;
             }
             string id = default;
-            long? bytes = default;
+            int? bytes = default;
             DateTimeOffset createdAt = default;
             string filename = default;
             InternalOpenAIFileObject @object = default;
@@ -134,7 +134,7 @@ internal static OpenAIFileInfo DeserializeOpenAIFileInfo(JsonElement element, Mo
                         bytes = null;
                         continue;
                     }
-                    bytes = property.Value.GetInt64();
+                    bytes = property.Value.GetInt32();
                     continue;
                 }
                 if (property.NameEquals("created_at"u8))
diff --git a/src/Generated/Models/OpenAIFileInfo.cs b/src/Generated/Models/OpenAIFileInfo.cs
index 240c8589..6643d5ab 100644
--- a/src/Generated/Models/OpenAIFileInfo.cs
+++ b/src/Generated/Models/OpenAIFileInfo.cs
@@ -10,7 +10,7 @@ namespace OpenAI.Files
     public partial class OpenAIFileInfo
     {
         internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        internal OpenAIFileInfo(string id, long? sizeInBytes, DateTimeOffset createdAt, string filename, OpenAIFilePurpose purpose, OpenAIFileStatus status)
+        internal OpenAIFileInfo(string id, int? sizeInBytes, DateTimeOffset createdAt, string filename, OpenAIFilePurpose purpose, OpenAIFileStatus status)
         {
             Argument.AssertNotNull(id, nameof(id));
             Argument.AssertNotNull(filename, nameof(filename));
@@ -23,7 +23,7 @@ internal OpenAIFileInfo(string id, long? sizeInBytes, DateTimeOffset createdAt,
             Status = status;
         }
 
-        internal OpenAIFileInfo(string id, long? sizeInBytes, DateTimeOffset createdAt, string filename, InternalOpenAIFileObject @object, OpenAIFilePurpose purpose, OpenAIFileStatus status, string statusDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal OpenAIFileInfo(string id, int? sizeInBytes, DateTimeOffset createdAt, string filename, InternalOpenAIFileObject @object, OpenAIFilePurpose purpose, OpenAIFileStatus status, string statusDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             SizeInBytes = sizeInBytes;
diff --git a/src/Generated/ModerationClient.cs b/src/Generated/ModerationClient.cs
index 9eac7994..73c07013 100644
--- a/src/Generated/ModerationClient.cs
+++ b/src/Generated/ModerationClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateCreateModerationRequest(BinaryContent content, Re
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/moderations", false);
+            uri.AppendPath("/v1/moderations", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
diff --git a/src/Generated/VectorStoreClient.cs b/src/Generated/VectorStoreClient.cs
index 5e44c7ab..14b48e96 100644
--- a/src/Generated/VectorStoreClient.cs
+++ b/src/Generated/VectorStoreClient.cs
@@ -32,7 +32,7 @@ internal PipelineMessage CreateGetVectorStoresRequest(int? limit, string order,
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores", false);
+            uri.AppendPath("/v1/vector_stores", false);
             if (limit != null)
             {
                 uri.AppendQuery("limit", limit.Value, true);
@@ -63,7 +63,7 @@ internal PipelineMessage CreateCreateVectorStoreRequest(BinaryContent content, R
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores", false);
+            uri.AppendPath("/v1/vector_stores", false);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
             request.Headers.Set("Content-Type", "application/json");
@@ -80,7 +80,7 @@ internal PipelineMessage CreateGetVectorStoreRequest(string vectorStoreId, Reque
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -96,7 +96,7 @@ internal PipelineMessage CreateModifyVectorStoreRequest(string vectorStoreId, Bi
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -114,7 +114,7 @@ internal PipelineMessage CreateDeleteVectorStoreRequest(string vectorStoreId, Re
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             request.Uri = uri.ToUri();
             request.Headers.Set("Accept", "application/json");
@@ -130,7 +130,7 @@ internal PipelineMessage CreateGetVectorStoreFilesRequest(string vectorStoreId,
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/files", false);
             if (limit != null)
@@ -167,7 +167,7 @@ internal PipelineMessage CreateCreateVectorStoreFileRequest(string vectorStoreId
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/files", false);
             request.Uri = uri.ToUri();
@@ -186,7 +186,7 @@ internal PipelineMessage CreateGetVectorStoreFileRequest(string vectorStoreId, s
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/files/", false);
             uri.AppendPath(fileId, true);
@@ -204,7 +204,7 @@ internal PipelineMessage CreateDeleteVectorStoreFileRequest(string vectorStoreId
             request.Method = "DELETE";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/files/", false);
             uri.AppendPath(fileId, true);
@@ -222,7 +222,7 @@ internal PipelineMessage CreateCreateVectorStoreFileBatchRequest(string vectorSt
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/file_batches", false);
             request.Uri = uri.ToUri();
@@ -241,7 +241,7 @@ internal PipelineMessage CreateGetVectorStoreFileBatchRequest(string vectorStore
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/file_batches/", false);
             uri.AppendPath(batchId, true);
@@ -259,7 +259,7 @@ internal PipelineMessage CreateCancelVectorStoreFileBatchRequest(string vectorSt
             request.Method = "POST";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/file_batches/", false);
             uri.AppendPath(batchId, true);
@@ -278,7 +278,7 @@ internal PipelineMessage CreateGetFilesInVectorStoreBatchesRequest(string vector
             request.Method = "GET";
             var uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
-            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath("/v1/vector_stores/", false);
             uri.AppendPath(vectorStoreId, true);
             uri.AppendPath("/file_batches/", false);
             uri.AppendPath(batchId, true);
diff --git a/tests/Assistants/VectorStoreTests.cs b/tests/Assistants/VectorStoreTests.cs
index ed4426f3..d13b1b08 100644
--- a/tests/Assistants/VectorStoreTests.cs
+++ b/tests/Assistants/VectorStoreTests.cs
@@ -187,7 +187,7 @@ public void CanAssociateFiles()
         _associationsToRemove.RemoveAt(0);
 
         // Errata: removals aren't immediately reflected when requesting the list
-        Thread.Sleep(1000);
+        Thread.Sleep(2000);
 
         int count = 0;
         foreach (VectorStoreFileAssociation association in client.GetFileAssociations(vectorStore).GetAllValues())
@@ -227,7 +227,7 @@ public void Pagination_CanRehydrateFileAssociationCollection()
         _associationsToRemove.RemoveAt(0);
 
         // Errata: removals aren't immediately reflected when requesting the list
-        Thread.Sleep(1000);
+        Thread.Sleep(2000);
 
         PageCollection<VectorStoreFileAssociation> pages = client.GetFileAssociations(vectorStore);
         IEnumerator<PageResult<VectorStoreFileAssociation>> pageEnumerator = ((IEnumerable<PageResult<VectorStoreFileAssociation>>)pages).GetEnumerator();
diff --git a/tests/Audio/TextToSpeechTests.cs b/tests/Audio/TextToSpeechTests.cs
index c3753e14..cbbd748d 100644
--- a/tests/Audio/TextToSpeechTests.cs
+++ b/tests/Audio/TextToSpeechTests.cs
@@ -23,8 +23,8 @@ public async Task BasicTextToSpeechWorks()
         AudioClient client = GetTestClient<AudioClient>(TestScenario.Audio_TTS);
 
         BinaryData audio = IsAsync
-            ? await client.GenerateSpeechFromTextAsync("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer)
-            : client.GenerateSpeechFromText("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer);
+            ? await client.GenerateSpeechAsync("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer)
+            : client.GenerateSpeech("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer);
 
         Assert.That(audio, Is.Not.Null);
         ValidateGeneratedAudio(audio, "hello");
@@ -47,8 +47,8 @@ public async Task OutputFormatWorks(GeneratedSpeechFormat? responseFormat)
             : new() { ResponseFormat = responseFormat };
 
         BinaryData audio = IsAsync
-            ? await client.GenerateSpeechFromTextAsync("Hello, world!", GeneratedSpeechVoice.Alloy, options)
-            : client.GenerateSpeechFromText("Hello, world!", GeneratedSpeechVoice.Alloy, options);
+            ? await client.GenerateSpeechAsync("Hello, world!", GeneratedSpeechVoice.Alloy, options)
+            : client.GenerateSpeech("Hello, world!", GeneratedSpeechVoice.Alloy, options);
 
         Assert.That(audio, Is.Not.Null);
     }
diff --git a/tests/Chat/ChatSmokeTests.cs b/tests/Chat/ChatSmokeTests.cs
index e9c172bc..169cb428 100644
--- a/tests/Chat/ChatSmokeTests.cs
+++ b/tests/Chat/ChatSmokeTests.cs
@@ -15,6 +15,7 @@
 using System.Threading.Tasks;
 using static OpenAI.Tests.Telemetry.TestMeterListener;
 using static OpenAI.Tests.TestHelpers;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace OpenAI.Tests.Chat;
 
@@ -585,4 +586,29 @@ public void SerializeMessagesWithNullProperties()
         FunctionChatMessage deserializedMessage = ModelReaderWriter.Read<FunctionChatMessage>(serializedMessage);
 #pragma warning restore
     }
+
+    [Test]
+    public void TopLevelClientOptionsPersistence()
+    {
+        MockPipelineTransport mockTransport = new(BinaryData.FromString("{}"), BinaryData.FromString("{}"));
+        OpenAIClientOptions options = new()
+        {
+            Transport = mockTransport,
+            Endpoint = new Uri("https://api.openai.com/expected/test/endpoint"),
+        };
+        Uri observedEndpoint = null;
+        options.AddPolicy(new TestPipelinePolicy(message =>
+        {
+            observedEndpoint = message?.Request?.Uri;
+            Console.WriteLine($"foo: {message.Request.Uri.AbsoluteUri}");
+        }),
+        PipelinePosition.PerCall);
+
+        OpenAIClient topLevelClient = new(new("mock-credential"), options);
+        ChatClient firstClient = topLevelClient.GetChatClient("mock-model");
+        ClientResult first = firstClient.CompleteChat("Hello, world");
+
+        Assert.That(observedEndpoint, Is.Not.Null);
+        Assert.That(observedEndpoint.AbsoluteUri, Does.Contain("expected/test/endpoint"));
+    }
 }