diff --git a/sdk/communication/Azure.Communication.CallingServer/api/Azure.Communication.CallingServer.netstandard2.0.cs b/sdk/communication/Azure.Communication.CallingServer/api/Azure.Communication.CallingServer.netstandard2.0.cs
index 59092993878c..ad7c0ef05010 100644
--- a/sdk/communication/Azure.Communication.CallingServer/api/Azure.Communication.CallingServer.netstandard2.0.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/api/Azure.Communication.CallingServer.netstandard2.0.cs
@@ -62,7 +62,8 @@ public CallConnectionStateChangedEvent() { }
     public partial class CallingServerClient
     {
         protected CallingServerClient() { }
-        public CallingServerClient(string connectionString, Azure.Communication.CallingServer.CallingServerClientOptions options = null) { }
+        public CallingServerClient(string connectionString) { }
+        public CallingServerClient(string connectionString, Azure.Communication.CallingServer.CallingServerClientOptions options) { }
         public virtual Azure.Response<Azure.Communication.CallingServer.CallConnection> CreateCallConnection(Azure.Communication.CommunicationIdentifier source, System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> targets, Azure.Communication.CallingServer.CreateCallOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Communication.CallingServer.CallConnection>> CreateCallConnectionAsync(Azure.Communication.CommunicationIdentifier source, System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> targets, Azure.Communication.CallingServer.CreateCallOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<System.IO.Stream> DownloadStreaming(System.Uri sourceEndpoint, Azure.HttpRange range = default(Azure.HttpRange), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -81,7 +82,7 @@ public partial class CallingServerClientOptions : Azure.Core.ClientOptions
         public CallingServerClientOptions(Azure.Communication.CallingServer.CallingServerClientOptions.ServiceVersion version = Azure.Communication.CallingServer.CallingServerClientOptions.ServiceVersion.V2021_06_15_Preview) { }
         public enum ServiceVersion
         {
-            V2021_06_15_Preview = 0,
+            V2021_06_15_Preview = 1,
         }
     }
     public partial class CallingServerError
@@ -205,11 +206,6 @@ public CreateCallOptions(System.Uri callbackUri, System.Collections.Generic.IEnu
         public System.Collections.Generic.IList<Azure.Communication.CallingServer.MediaType> RequestedMediaTypes { get { throw null; } }
         public string Subject { get { throw null; } set { } }
     }
-    public partial class CreateCallResult
-    {
-        internal CreateCallResult() { }
-        public string CallConnectionId { get { throw null; } }
-    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventSubscriptionType : System.IEquatable<Azure.Communication.CallingServer.EventSubscriptionType>
     {
@@ -236,11 +232,6 @@ public JoinCallOptions(System.Uri callbackUri, System.Collections.Generic.IEnume
         public System.Collections.Generic.IList<Azure.Communication.CallingServer.MediaType> RequestedMediaTypes { get { throw null; } }
         public string Subject { get { throw null; } set { } }
     }
-    public partial class JoinCallResult
-    {
-        internal JoinCallResult() { }
-        public string CallConnectionId { get { throw null; } }
-    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct MediaType : System.IEquatable<Azure.Communication.CallingServer.MediaType>
     {
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Azure.Communication.CallingServer.csproj b/sdk/communication/Azure.Communication.CallingServer/src/Azure.Communication.CallingServer.csproj
index af9fd5b53b07..b6c54a2c7064 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Azure.Communication.CallingServer.csproj
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Azure.Communication.CallingServer.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>
-      This client library enables working with the Microsoft Azure Communication Service Calling Server APIs.
+      This client library enables working with the Microsoft Azure Communication CallingServer service.
       For this release, see notes - https://github.com/Azure/azure-sdk-for-net-pr/blob/master/sdk/communication/Azure.Communication.ServerCalling/README.md and https://github.com/Azure/azure-sdk-for-net-pr/blob/master/sdk/communication/Azure.Communication.ServerCalling/CHANGELOG.md.
     </Description>
-    <AssemblyTitle>Azure Communication Service Calling Server APIs</AssemblyTitle>
+    <AssemblyTitle>Azure Communication CallingServer Service</AssemblyTitle>
     <Version>1.0.0-beta.1</Version>
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
-    <PackageTags>Microsoft Azure Communication Calling Server APIs;Microsoft;Azure;Azure Communication Service;Azure Communication Calling Server APIs;Calling;Communication;$(PackageCommonTags)</PackageTags>
+    <PackageTags>Microsoft Azure Communication CallingServer Service;Microsoft;Azure;Azure Communication Service;Azure Communication CallingServer Service;Calling;Communication;$(PackageCommonTags)</PackageTags>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClient.cs b/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClient.cs
index d8b90fa3fc4d..d6b5143d7049 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClient.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClient.cs
@@ -27,14 +27,21 @@ public class CallingServerClient
         internal ServerCallsRestClient ServerCallRestClient { get; }
 
         #region public constructors
+        /// <summary> Initializes a new instance of <see cref="CallingServerClient"/>.</summary>
+        /// <param name="connectionString">Connection string acquired from the Azure Communication Services resource.</param>
+        public CallingServerClient(string connectionString)
+            : this(
+                  ConnectionString.Parse(Argument.CheckNotNullOrEmpty(connectionString, nameof(connectionString))),
+                  new CallingServerClientOptions())
+        { }
 
         /// <summary> Initializes a new instance of <see cref="CallingServerClient"/>.</summary>
         /// <param name="connectionString">Connection string acquired from the Azure Communication Services resource.</param>
         /// <param name="options">Client option exposing <see cref="ClientOptions.Diagnostics"/>, <see cref="ClientOptions.Retry"/>, <see cref="ClientOptions.Transport"/>, etc.</param>
-        public CallingServerClient(string connectionString, CallingServerClientOptions options = default)
+        public CallingServerClient(string connectionString, CallingServerClientOptions options)
             : this(
                   ConnectionString.Parse(Argument.CheckNotNullOrEmpty(connectionString, nameof(connectionString))),
-                  options ?? new CallingServerClientOptions())
+                  Argument.CheckNotNull(options, nameof(options)))
         { }
 
         #endregion
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClientOptions.cs b/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClientOptions.cs
index ad8bb959d0b8..737b9a76425b 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClientOptions.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/CallingServerClientOptions.cs
@@ -39,7 +39,7 @@ public enum ServiceVersion
             /// The Beta of the CallingServer service.
             /// </summary>
 #pragma warning disable CA1707 // Identifiers should not contain underscores
-            V2021_06_15_Preview = 0
+            V2021_06_15_Preview = 1
 #pragma warning restore CA1707 // Identifiers should not contain underscores
         }
     }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallConnectionsRestClient.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallConnectionsRestClient.cs
index 122f97dd712c..3f8394544adc 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallConnectionsRestClient.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallConnectionsRestClient.cs
@@ -13,6 +13,7 @@
 using System.Threading.Tasks;
 using Azure;
 using Azure.Communication;
+using Azure.Communication.CallingServer.Models;
 using Azure.Core;
 using Azure.Core.Pipeline;
 
@@ -96,7 +97,7 @@ internal HttpMessage CreateCreateCallRequest(IEnumerable<CommunicationIdentifier
         /// <param name="requestedCallEvents"> The requested call events to subscribe to. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="targets"/>, <paramref name="source"/>, or <paramref name="callbackUri"/> is null. </exception>
-        public async Task<Response<CreateCallResult>> CreateCallAsync(IEnumerable<CommunicationIdentifierModel> targets, CommunicationIdentifierModel source, string callbackUri, PhoneNumberIdentifierModel alternateCallerId = null, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
+        public async Task<Response<CreateCallResultInternal>> CreateCallAsync(IEnumerable<CommunicationIdentifierModel> targets, CommunicationIdentifierModel source, string callbackUri, PhoneNumberIdentifierModel alternateCallerId = null, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
         {
             if (targets == null)
             {
@@ -117,9 +118,9 @@ public async Task<Response<CreateCallResult>> CreateCallAsync(IEnumerable<Commun
             {
                 case 201:
                     {
-                        CreateCallResult value = default;
+                        CreateCallResultInternal value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
-                        value = CreateCallResult.DeserializeCreateCallResult(document.RootElement);
+                        value = CreateCallResultInternal.DeserializeCreateCallResultInternal(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -137,7 +138,7 @@ public async Task<Response<CreateCallResult>> CreateCallAsync(IEnumerable<Commun
         /// <param name="requestedCallEvents"> The requested call events to subscribe to. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="targets"/>, <paramref name="source"/>, or <paramref name="callbackUri"/> is null. </exception>
-        public Response<CreateCallResult> CreateCall(IEnumerable<CommunicationIdentifierModel> targets, CommunicationIdentifierModel source, string callbackUri, PhoneNumberIdentifierModel alternateCallerId = null, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
+        public Response<CreateCallResultInternal> CreateCall(IEnumerable<CommunicationIdentifierModel> targets, CommunicationIdentifierModel source, string callbackUri, PhoneNumberIdentifierModel alternateCallerId = null, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
         {
             if (targets == null)
             {
@@ -158,9 +159,9 @@ public Response<CreateCallResult> CreateCall(IEnumerable<CommunicationIdentifier
             {
                 case 201:
                     {
-                        CreateCallResult value = default;
+                        CreateCallResultInternal value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream);
-                        value = CreateCallResult.DeserializeCreateCallResult(document.RootElement);
+                        value = CreateCallResultInternal.DeserializeCreateCallResultInternal(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallingServerModelFactory.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallingServerModelFactory.cs
index 3cdddd765777..d68cb269c6c0 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallingServerModelFactory.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/CallingServerModelFactory.cs
@@ -12,14 +12,6 @@ namespace Azure.Communication.CallingServer
     /// <summary> Model factory for read-only models. </summary>
     internal static partial class CallingServerModelFactory
     {
-        /// <summary> Initializes new instance of CreateCallResult class. </summary>
-        /// <param name="callConnectionId"> The call connection id. </param>
-        /// <returns> A new <see cref="CallingServer.CreateCallResult"/> instance for mocking. </returns>
-        public static CreateCallResult CreateCallResult(string callConnectionId = default)
-        {
-            return new CreateCallResult(callConnectionId);
-        }
-
         /// <summary> Initializes new instance of CallingServerErrorResponse class. </summary>
         /// <param name="error"> The Communication Services error. </param>
         /// <returns> A new <see cref="CallingServer.CallingServerErrorResponse"/> instance for mocking. </returns>
@@ -108,13 +100,5 @@ public static CallRecordingProperties CallRecordingProperties(CallRecordingState
         {
             return new CallRecordingProperties(recordingState);
         }
-
-        /// <summary> Initializes new instance of JoinCallResult class. </summary>
-        /// <param name="callConnectionId"> The call connection id. </param>
-        /// <returns> A new <see cref="CallingServer.JoinCallResult"/> instance for mocking. </returns>
-        public static JoinCallResult JoinCallResult(string callConnectionId = default)
-        {
-            return new JoinCallResult(callConnectionId);
-        }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.Serialization.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.Serialization.cs
similarity index 66%
rename from sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.Serialization.cs
rename to sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.Serialization.cs
index 86f13f76c0fa..cee1cf9c7cb5 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.Serialization.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.Serialization.cs
@@ -8,11 +8,11 @@
 using System.Text.Json;
 using Azure.Core;
 
-namespace Azure.Communication.CallingServer
+namespace Azure.Communication.CallingServer.Models
 {
-    public partial class JoinCallResult
+    internal partial class CreateCallResultInternal
     {
-        internal static JoinCallResult DeserializeJoinCallResult(JsonElement element)
+        internal static CreateCallResultInternal DeserializeCreateCallResultInternal(JsonElement element)
         {
             Optional<string> callConnectionId = default;
             foreach (var property in element.EnumerateObject())
@@ -23,7 +23,7 @@ internal static JoinCallResult DeserializeJoinCallResult(JsonElement element)
                     continue;
                 }
             }
-            return new JoinCallResult(callConnectionId.Value);
+            return new CreateCallResultInternal(callConnectionId.Value);
         }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.cs
similarity index 70%
rename from sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.cs
rename to sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.cs
index 29488a7a7a5b..ecc38bbccba4 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResultInternal.cs
@@ -5,19 +5,19 @@
 
 #nullable disable
 
-namespace Azure.Communication.CallingServer
+namespace Azure.Communication.CallingServer.Models
 {
     /// <summary> The response payload of the create call operation. </summary>
-    public partial class CreateCallResult
+    internal partial class CreateCallResultInternal
     {
-        /// <summary> Initializes a new instance of CreateCallResult. </summary>
-        internal CreateCallResult()
+        /// <summary> Initializes a new instance of CreateCallResultInternal. </summary>
+        internal CreateCallResultInternal()
         {
         }
 
-        /// <summary> Initializes a new instance of CreateCallResult. </summary>
+        /// <summary> Initializes a new instance of CreateCallResultInternal. </summary>
         /// <param name="callConnectionId"> The call connection id. </param>
-        internal CreateCallResult(string callConnectionId)
+        internal CreateCallResultInternal(string callConnectionId)
         {
             CallConnectionId = callConnectionId;
         }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.Serialization.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.Serialization.cs
similarity index 67%
rename from sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.Serialization.cs
rename to sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.Serialization.cs
index 2418fc36a73d..cf1a06735785 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/CreateCallResult.Serialization.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.Serialization.cs
@@ -8,11 +8,11 @@
 using System.Text.Json;
 using Azure.Core;
 
-namespace Azure.Communication.CallingServer
+namespace Azure.Communication.CallingServer.Models
 {
-    public partial class CreateCallResult
+    internal partial class JoinCallResultInternal
     {
-        internal static CreateCallResult DeserializeCreateCallResult(JsonElement element)
+        internal static JoinCallResultInternal DeserializeJoinCallResultInternal(JsonElement element)
         {
             Optional<string> callConnectionId = default;
             foreach (var property in element.EnumerateObject())
@@ -23,7 +23,7 @@ internal static CreateCallResult DeserializeCreateCallResult(JsonElement element
                     continue;
                 }
             }
-            return new CreateCallResult(callConnectionId.Value);
+            return new JoinCallResultInternal(callConnectionId.Value);
         }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.cs
similarity index 71%
rename from sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.cs
rename to sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.cs
index daa4e90f76a1..01ab86221bdd 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResult.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/Models/JoinCallResultInternal.cs
@@ -5,19 +5,19 @@
 
 #nullable disable
 
-namespace Azure.Communication.CallingServer
+namespace Azure.Communication.CallingServer.Models
 {
     /// <summary> The response payload of the join call operation. </summary>
-    public partial class JoinCallResult
+    internal partial class JoinCallResultInternal
     {
-        /// <summary> Initializes a new instance of JoinCallResult. </summary>
-        internal JoinCallResult()
+        /// <summary> Initializes a new instance of JoinCallResultInternal. </summary>
+        internal JoinCallResultInternal()
         {
         }
 
-        /// <summary> Initializes a new instance of JoinCallResult. </summary>
+        /// <summary> Initializes a new instance of JoinCallResultInternal. </summary>
         /// <param name="callConnectionId"> The call connection id. </param>
-        internal JoinCallResult(string callConnectionId)
+        internal JoinCallResultInternal(string callConnectionId)
         {
             CallConnectionId = callConnectionId;
         }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Generated/ServerCallsRestClient.cs b/sdk/communication/Azure.Communication.CallingServer/src/Generated/ServerCallsRestClient.cs
index a5d581374cdc..04fc41f14bcd 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Generated/ServerCallsRestClient.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Generated/ServerCallsRestClient.cs
@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Azure;
 using Azure.Communication;
+using Azure.Communication.CallingServer.Models;
 using Azure.Core;
 using Azure.Core.Pipeline;
 
@@ -631,7 +632,7 @@ internal HttpMessage CreateJoinCallRequest(string serverCallId, CommunicationIde
         /// <param name="requestedCallEvents"> The requested call events to subscribe to. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="serverCallId"/>, <paramref name="source"/>, or <paramref name="callbackUri"/> is null. </exception>
-        public async Task<Response<JoinCallResult>> JoinCallAsync(string serverCallId, CommunicationIdentifierModel source, string callbackUri, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
+        public async Task<Response<JoinCallResultInternal>> JoinCallAsync(string serverCallId, CommunicationIdentifierModel source, string callbackUri, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
         {
             if (serverCallId == null)
             {
@@ -652,9 +653,9 @@ public async Task<Response<JoinCallResult>> JoinCallAsync(string serverCallId, C
             {
                 case 202:
                     {
-                        JoinCallResult value = default;
+                        JoinCallResultInternal value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
-                        value = JoinCallResult.DeserializeJoinCallResult(document.RootElement);
+                        value = JoinCallResultInternal.DeserializeJoinCallResultInternal(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -671,7 +672,7 @@ public async Task<Response<JoinCallResult>> JoinCallAsync(string serverCallId, C
         /// <param name="requestedCallEvents"> The requested call events to subscribe to. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="serverCallId"/>, <paramref name="source"/>, or <paramref name="callbackUri"/> is null. </exception>
-        public Response<JoinCallResult> JoinCall(string serverCallId, CommunicationIdentifierModel source, string callbackUri, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
+        public Response<JoinCallResultInternal> JoinCall(string serverCallId, CommunicationIdentifierModel source, string callbackUri, string subject = null, IEnumerable<MediaType> requestedMediaTypes = null, IEnumerable<EventSubscriptionType> requestedCallEvents = null, CancellationToken cancellationToken = default)
         {
             if (serverCallId == null)
             {
@@ -692,9 +693,9 @@ public Response<JoinCallResult> JoinCall(string serverCallId, CommunicationIdent
             {
                 case 202:
                     {
-                        JoinCallResult value = default;
+                        JoinCallResultInternal value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream);
-                        value = JoinCallResult.DeserializeJoinCallResult(document.RootElement);
+                        value = JoinCallResultInternal.DeserializeJoinCallResultInternal(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Models/CallingServerModelFactory.cs b/sdk/communication/Azure.Communication.CallingServer/src/Models/CallingServerModelFactory.cs
index 24ecd69275cf..328a22c85140 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/Models/CallingServerModelFactory.cs
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Models/CallingServerModelFactory.cs
@@ -8,7 +8,7 @@ namespace Azure.Communication.CallingServer
     /// <summary>
     /// Calling server model factory
     /// </summary>
-    [CodeGenModel("AzureCommunicationCallingServerServiceModelFactory")]
+    [CodeGenModel("AzureCommunicationServicesModelFactory")]
     internal partial class CallingServerModelFactory
     {
     }
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Models/CreateCallResultInternal.cs b/sdk/communication/Azure.Communication.CallingServer/src/Models/CreateCallResultInternal.cs
new file mode 100644
index 000000000000..494d3eca060c
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Models/CreateCallResultInternal.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.Communication.CallingServer.Models
+{
+    [CodeGenModel("CreateCallResult")]
+    internal partial class CreateCallResultInternal
+    {
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/Models/JoinCallResultInternal.cs b/sdk/communication/Azure.Communication.CallingServer/src/Models/JoinCallResultInternal.cs
new file mode 100644
index 000000000000..1c676205ff73
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallingServer/src/Models/JoinCallResultInternal.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.Communication.CallingServer.Models
+{
+    [CodeGenModel("JoinCallResult")]
+    internal partial class JoinCallResultInternal
+    {
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallingServer/src/autorest.md b/sdk/communication/Azure.Communication.CallingServer/src/autorest.md
index 7dab201e86f0..2188936401f2 100644
--- a/sdk/communication/Azure.Communication.CallingServer/src/autorest.md
+++ b/sdk/communication/Azure.Communication.CallingServer/src/autorest.md
@@ -8,15 +8,12 @@ If any of the new objects needs to be overwritten, add the required changes to t
 
 3. Repeat 2 and 3 until the desided interface is reflected in the apiview.dev.
 
-## General settings
-> see https://aka.ms/autorest 
-
-## Configuration 
-The following are the settings for generating this API with AutoRest.
+### AutoRest Configuration
+> see https://aka.ms/autorest
 
 ```yaml
-tag: beta
-input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5ffa6f90f1916423bd09855f1bfe32d2bd78ecab/specification/communication/data-plane/CallingServer/readme.md
+require:
+    -  https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5ffa6f90f1916423bd09855f1bfe32d2bd78ecab/specification/communication/data-plane/CallingServer/readme.md
 payload-flattening-threshold: 10
 clear-output-folder: true
 directive: