diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java
index 8b8bdd4c9c5d9..234b402318449 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java
@@ -239,9 +239,9 @@ public Mono<Response<StartCallRecordingResult>> startRecordingWithResponse(
             request.setRecordingStateCallbackUri(recordingStateCallbackUri);
 
             if (startRecordingOptions != null) {
-                request.setRecordingChannelType(startRecordingOptions.getRecordingChannelType());
-                request.setRecordingContentType(startRecordingOptions.getRecordingContentType());
-                request.setRecordingFormatType(startRecordingOptions.getRecordingFormatType());
+                request.setRecordingChannelType(startRecordingOptions.getRecordingChannel());
+                request.setRecordingContentType(startRecordingOptions.getRecordingContent());
+                request.setRecordingFormatType(startRecordingOptions.getRecordingFormat());
             }
 
             return withContext(contextValue -> {
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannel.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannel.java
new file mode 100644
index 0000000000000..58363967867d4
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannel.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.implementation.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingChannel. */
+public final class RecordingChannel extends ExpandableStringEnum<RecordingChannel> {
+    /** Static value mixed for RecordingChannel. */
+    public static final RecordingChannel MIXED = fromString("mixed");
+
+    /** Static value unmixed for RecordingChannel. */
+    public static final RecordingChannel UNMIXED = fromString("unmixed");
+
+    /**
+     * Creates or finds a RecordingChannel from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingChannel.
+     */
+    @JsonCreator
+    public static RecordingChannel fromString(String name) {
+        return fromString(name, RecordingChannel.class);
+    }
+
+    /** @return known RecordingChannel values. */
+    public static Collection<RecordingChannel> values() {
+        return values(RecordingChannel.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannelType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannelType.java
deleted file mode 100644
index 2f272fe772b70..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingChannelType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.implementation.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingChannelType. */
-public final class RecordingChannelType extends ExpandableStringEnum<RecordingChannelType> {
-    /** Static value mixed for RecordingChannelType. */
-    public static final RecordingChannelType MIXED = fromString("mixed");
-
-    /** Static value unmixed for RecordingChannelType. */
-    public static final RecordingChannelType UNMIXED = fromString("unmixed");
-
-    /**
-     * Creates or finds a RecordingChannelType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingChannelType.
-     */
-    @JsonCreator
-    public static RecordingChannelType fromString(String name) {
-        return fromString(name, RecordingChannelType.class);
-    }
-
-    /** @return known RecordingChannelType values. */
-    public static Collection<RecordingChannelType> values() {
-        return values(RecordingChannelType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContent.java
new file mode 100644
index 0000000000000..cb3a2a08c02b3
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContent.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.implementation.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingContent. */
+public final class RecordingContent extends ExpandableStringEnum<RecordingContent> {
+    /** Static value audio for RecordingContent. */
+    public static final RecordingContent AUDIO = fromString("audio");
+
+    /** Static value audioVideo for RecordingContent. */
+    public static final RecordingContent AUDIO_VIDEO = fromString("audioVideo");
+
+    /**
+     * Creates or finds a RecordingContent from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingContent.
+     */
+    @JsonCreator
+    public static RecordingContent fromString(String name) {
+        return fromString(name, RecordingContent.class);
+    }
+
+    /** @return known RecordingContent values. */
+    public static Collection<RecordingContent> values() {
+        return values(RecordingContent.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContentType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContentType.java
deleted file mode 100644
index fd0d9d4465130..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingContentType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.implementation.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingContentType. */
-public final class RecordingContentType extends ExpandableStringEnum<RecordingContentType> {
-    /** Static value audio for RecordingContentType. */
-    public static final RecordingContentType AUDIO = fromString("audio");
-
-    /** Static value audioVideo for RecordingContentType. */
-    public static final RecordingContentType AUDIO_VIDEO = fromString("audioVideo");
-
-    /**
-     * Creates or finds a RecordingContentType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingContentType.
-     */
-    @JsonCreator
-    public static RecordingContentType fromString(String name) {
-        return fromString(name, RecordingContentType.class);
-    }
-
-    /** @return known RecordingContentType values. */
-    public static Collection<RecordingContentType> values() {
-        return values(RecordingContentType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormat.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormat.java
new file mode 100644
index 0000000000000..b9766c0c48a70
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormat.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.implementation.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingFormat. */
+public final class RecordingFormat extends ExpandableStringEnum<RecordingFormat> {
+    /** Static value wav for RecordingFormat. */
+    public static final RecordingFormat WAV = fromString("wav");
+
+    /** Static value mp3 for RecordingFormat. */
+    public static final RecordingFormat MP3 = fromString("mp3");
+
+    /** Static value mp4 for RecordingFormat. */
+    public static final RecordingFormat MP4 = fromString("mp4");
+
+    /**
+     * Creates or finds a RecordingFormat from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingFormat.
+     */
+    @JsonCreator
+    public static RecordingFormat fromString(String name) {
+        return fromString(name, RecordingFormat.class);
+    }
+
+    /** @return known RecordingFormat values. */
+    public static Collection<RecordingFormat> values() {
+        return values(RecordingFormat.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormatType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormatType.java
deleted file mode 100644
index e5050db79ee55..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/RecordingFormatType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.implementation.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingFormatType. */
-public final class RecordingFormatType extends ExpandableStringEnum<RecordingFormatType> {
-    /** Static value wav for RecordingFormatType. */
-    public static final RecordingFormatType WAV = fromString("wav");
-
-    /** Static value mp3 for RecordingFormatType. */
-    public static final RecordingFormatType MP3 = fromString("mp3");
-
-    /** Static value mp4 for RecordingFormatType. */
-    public static final RecordingFormatType MP4 = fromString("mp4");
-
-    /**
-     * Creates or finds a RecordingFormatType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingFormatType.
-     */
-    @JsonCreator
-    public static RecordingFormatType fromString(String name) {
-        return fromString(name, RecordingFormatType.class);
-    }
-
-    /** @return known RecordingFormatType values. */
-    public static Collection<RecordingFormatType> values() {
-        return values(RecordingFormatType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/StartCallRecordingRequest.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/StartCallRecordingRequest.java
index 0398c5ba983b2..9312164687f8e 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/StartCallRecordingRequest.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/StartCallRecordingRequest.java
@@ -4,9 +4,10 @@
 
 package com.azure.communication.callingserver.implementation.models;
 
-import com.azure.communication.callingserver.models.RecordingChannelType;
-import com.azure.communication.callingserver.models.RecordingContentType;
-import com.azure.communication.callingserver.models.RecordingFormatType;
+import com.azure.communication.callingserver.models.RecordingChannel;
+import com.azure.communication.callingserver.models.RecordingContent;
+import com.azure.communication.callingserver.models.RecordingFormat;
+
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -23,19 +24,19 @@ public final class StartCallRecordingRequest {
      * Optional, audioVideo by default
      */
     @JsonProperty(value = "recordingContentType")
-    private RecordingContentType recordingContentType;
+    private RecordingContent recordingContentType;
 
     /*
      * Optional, mixed by default
      */
     @JsonProperty(value = "recordingChannelType")
-    private RecordingChannelType recordingChannelType;
+    private RecordingChannel recordingChannelType;
 
     /*
      * Optional, mp4 by default
      */
     @JsonProperty(value = "recordingFormatType")
-    private RecordingFormatType recordingFormatType;
+    private RecordingFormat recordingFormatType;
 
     /**
      * Get the recordingStateCallbackUri property: The uri to send notifications to.
@@ -62,7 +63,7 @@ public StartCallRecordingRequest setRecordingStateCallbackUri(String recordingSt
      *
      * @return the recordingContentType value.
      */
-    public RecordingContentType getRecordingContentType() {
+    public RecordingContent getRecordingContentType() {
         return this.recordingContentType;
     }
 
@@ -72,7 +73,7 @@ public RecordingContentType getRecordingContentType() {
      * @param recordingContentType the recordingContentType value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartCallRecordingRequest setRecordingContentType(RecordingContentType recordingContentType) {
+    public StartCallRecordingRequest setRecordingContentType(RecordingContent recordingContentType) {
         this.recordingContentType = recordingContentType;
         return this;
     }
@@ -82,7 +83,7 @@ public StartCallRecordingRequest setRecordingContentType(RecordingContentType re
      *
      * @return the recordingChannelType value.
      */
-    public RecordingChannelType getRecordingChannelType() {
+    public RecordingChannel getRecordingChannelType() {
         return this.recordingChannelType;
     }
 
@@ -92,7 +93,7 @@ public RecordingChannelType getRecordingChannelType() {
      * @param recordingChannelType the recordingChannelType value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartCallRecordingRequest setRecordingChannelType(RecordingChannelType recordingChannelType) {
+    public StartCallRecordingRequest setRecordingChannelType(RecordingChannel recordingChannelType) {
         this.recordingChannelType = recordingChannelType;
         return this;
     }
@@ -102,7 +103,7 @@ public StartCallRecordingRequest setRecordingChannelType(RecordingChannelType re
      *
      * @return the recordingFormatType value.
      */
-    public RecordingFormatType getRecordingFormatType() {
+    public RecordingFormat getRecordingFormatType() {
         return this.recordingFormatType;
     }
 
@@ -112,7 +113,7 @@ public RecordingFormatType getRecordingFormatType() {
      * @param recordingFormatType the recordingFormatType value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartCallRecordingRequest setRecordingFormatType(RecordingFormatType recordingFormatType) {
+    public StartCallRecordingRequest setRecordingFormatType(RecordingFormat recordingFormatType) {
         this.recordingFormatType = recordingFormatType;
         return this;
     }
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannel.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannel.java
new file mode 100644
index 0000000000000..de5f03aff28e2
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannel.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingChannel. */
+public final class RecordingChannel extends ExpandableStringEnum<RecordingChannel> {
+    /** Static value mixed for RecordingChannel. */
+    public static final RecordingChannel MIXED = fromString("mixed");
+
+    /** Static value unmixed for RecordingChannel. */
+    public static final RecordingChannel UNMIXED = fromString("unmixed");
+
+    /**
+     * Creates or finds a RecordingChannel from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingChannel.
+     */
+    @JsonCreator
+    public static RecordingChannel fromString(String name) {
+        return fromString(name, RecordingChannel.class);
+    }
+
+    /** @return known RecordingChannel values. */
+    public static Collection<RecordingChannel> values() {
+        return values(RecordingChannel.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannelType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannelType.java
deleted file mode 100644
index f2d25ac85ce4a..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingChannelType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingChannelType. */
-public final class RecordingChannelType extends ExpandableStringEnum<RecordingChannelType> {
-    /** Static value mixed for RecordingChannelType. */
-    public static final RecordingChannelType MIXED = fromString("mixed");
-
-    /** Static value unmixed for RecordingChannelType. */
-    public static final RecordingChannelType UNMIXED = fromString("unmixed");
-
-    /**
-     * Creates or finds a RecordingChannelType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingChannelType.
-     */
-    @JsonCreator
-    public static RecordingChannelType fromString(String name) {
-        return fromString(name, RecordingChannelType.class);
-    }
-
-    /** @return known RecordingChannelType values. */
-    public static Collection<RecordingChannelType> values() {
-        return values(RecordingChannelType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContent.java
new file mode 100644
index 0000000000000..8f8eb5ee696f8
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContent.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingContent. */
+public final class RecordingContent extends ExpandableStringEnum<RecordingContent> {
+    /** Static value audio for RecordingContent. */
+    public static final RecordingContent AUDIO = fromString("audio");
+
+    /** Static value audioVideo for RecordingContent. */
+    public static final RecordingContent AUDIO_VIDEO = fromString("audioVideo");
+
+    /**
+     * Creates or finds a RecordingContent from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingContent.
+     */
+    @JsonCreator
+    public static RecordingContent fromString(String name) {
+        return fromString(name, RecordingContent.class);
+    }
+
+    /** @return known RecordingContent values. */
+    public static Collection<RecordingContent> values() {
+        return values(RecordingContent.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContentType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContentType.java
deleted file mode 100644
index f01864592b3f9..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingContentType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingContentType. */
-public final class RecordingContentType extends ExpandableStringEnum<RecordingContentType> {
-    /** Static value audio for RecordingContentType. */
-    public static final RecordingContentType AUDIO = fromString("audio");
-
-    /** Static value audioVideo for RecordingContentType. */
-    public static final RecordingContentType AUDIO_VIDEO = fromString("audioVideo");
-
-    /**
-     * Creates or finds a RecordingContentType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingContentType.
-     */
-    @JsonCreator
-    public static RecordingContentType fromString(String name) {
-        return fromString(name, RecordingContentType.class);
-    }
-
-    /** @return known RecordingContentType values. */
-    public static Collection<RecordingContentType> values() {
-        return values(RecordingContentType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormat.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormat.java
new file mode 100644
index 0000000000000..0f7b06ab8eda8
--- /dev/null
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormat.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.communication.callingserver.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** Defines values for RecordingFormat. */
+public final class RecordingFormat extends ExpandableStringEnum<RecordingFormat> {
+    /** Static value wav for RecordingFormat. */
+    public static final RecordingFormat WAV = fromString("wav");
+
+    /** Static value mp3 for RecordingFormat. */
+    public static final RecordingFormat MP3 = fromString("mp3");
+
+    /** Static value mp4 for RecordingFormat. */
+    public static final RecordingFormat MP4 = fromString("mp4");
+
+    /**
+     * Creates or finds a RecordingFormat from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RecordingFormat.
+     */
+    @JsonCreator
+    public static RecordingFormat fromString(String name) {
+        return fromString(name, RecordingFormat.class);
+    }
+
+    /** @return known RecordingFormat values. */
+    public static Collection<RecordingFormat> values() {
+        return values(RecordingFormat.class);
+    }
+}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormatType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormatType.java
deleted file mode 100644
index 7fa2fe097a76e..0000000000000
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/RecordingFormatType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.communication.callingserver.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import java.util.Collection;
-
-/** Defines values for RecordingFormatType. */
-public final class RecordingFormatType extends ExpandableStringEnum<RecordingFormatType> {
-    /** Static value wav for RecordingFormatType. */
-    public static final RecordingFormatType WAV = fromString("wav");
-
-    /** Static value mp3 for RecordingFormatType. */
-    public static final RecordingFormatType MP3 = fromString("mp3");
-
-    /** Static value mp4 for RecordingFormatType. */
-    public static final RecordingFormatType MP4 = fromString("mp4");
-
-    /**
-     * Creates or finds a RecordingFormatType from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding RecordingFormatType.
-     */
-    @JsonCreator
-    public static RecordingFormatType fromString(String name) {
-        return fromString(name, RecordingFormatType.class);
-    }
-
-    /** @return known RecordingFormatType values. */
-    public static Collection<RecordingFormatType> values() {
-        return values(RecordingFormatType.class);
-    }
-}
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartRecordingOptions.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartRecordingOptions.java
index 85f03889a3f7d..bbda2e0c6ee99 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartRecordingOptions.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartRecordingOptions.java
@@ -10,67 +10,67 @@
 @Fluent
 public final class StartRecordingOptions {
 
-    private RecordingContentType recordingContentType = null;
-    private RecordingChannelType recordingChannelType = null; 
-    private RecordingFormatType recordingFormatType = null;
+    private RecordingContent recordingContent = null;
+    private RecordingChannel recordingChannel = null; 
+    private RecordingFormat recordingFormat = null;
 
     /**
-     * Get the recordingContentType property: Optional, audioVideo by default.
+     * Get the recordingContent property: Optional, audioVideo by default.
      *
-     * @return the recordingContentType value.
+     * @return the recordingContent value.
      */
-    public RecordingContentType getRecordingContentType() {
-        return this.recordingContentType;
+    public RecordingContent getRecordingContent() {
+        return this.recordingContent;
     }
 
     /**
-     * Set the recordingContentType property: Optional, audioVideo by default.
+     * Set the recordingContent property: Optional, audioVideo by default.
      *
-     * @param recordingContentType the recordingContentType value to set.
+     * @param recordingContent the recordingContent value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartRecordingOptions setRecordingContentType(RecordingContentType recordingContentType) {
-        this.recordingContentType = recordingContentType;
+    public StartRecordingOptions setRecordingContent(RecordingContent recordingContent) {
+        this.recordingContent = recordingContent;
         return this;
     }
 
     /**
-     * Get the recordingChannelType property: Optional, mixed by default.
+     * Get the recordingChannel property: Optional, mixed by default.
      *
-     * @return the recordingChannelType value.
+     * @return the recordingChannel value.
      */
-    public RecordingChannelType getRecordingChannelType() {
-        return this.recordingChannelType;
+    public RecordingChannel getRecordingChannel() {
+        return this.recordingChannel;
     }
 
     /**
-     * Set the recordingChannelType property: Optional, mixed by default.
+     * Set the recordingChannel property: Optional, mixed by default.
      *
-     * @param recordingChannelType the recordingChannelType value to set.
+     * @param recordingChannel the recordingChannel value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartRecordingOptions setRecordingChannelType(RecordingChannelType recordingChannelType) {
-        this.recordingChannelType = recordingChannelType;
+    public StartRecordingOptions setRecordingChannel(RecordingChannel recordingChannel) {
+        this.recordingChannel = recordingChannel;
         return this;
     }
 
     /**
-     * Get the recordingFormatType property: Optional, mp4 by default.
+     * Get the recordingFormat property: Optional, mp4 by default.
      *
-     * @return the recordingFormatType value.
+     * @return the recordingFormat value.
      */
-    public RecordingFormatType getRecordingFormatType() {
-        return this.recordingFormatType;
+    public RecordingFormat getRecordingFormat() {
+        return this.recordingFormat;
     }
 
     /**
-     * Set the recordingFormatType property: Optional, mp4 by default.
+     * Set the recordingFormat property: Optional, mp4 by default.
      *
-     * @param recordingFormatType the recordingFormatType value to set.
+     * @param recordingFormat the recordingFormat value to set.
      * @return the StartCallRecordingRequest object itself.
      */
-    public StartRecordingOptions setRecordingFormatType(RecordingFormatType recordingFormatType) {
-        this.recordingFormatType = recordingFormatType;
+    public StartRecordingOptions setRecordingFormat(RecordingFormat recordingFormat) {
+        this.recordingFormat = recordingFormat;
         return this;
     }
 
diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallUnitTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallUnitTests.java
index 019472bbda0fb..dc2d3ab18ff93 100644
--- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallUnitTests.java
+++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallUnitTests.java
@@ -10,9 +10,9 @@
 import java.util.Arrays;
 import java.util.AbstractMap.SimpleEntry;
 
-import com.azure.communication.callingserver.models.RecordingChannelType;
-import com.azure.communication.callingserver.models.RecordingContentType;
-import com.azure.communication.callingserver.models.RecordingFormatType;
+import com.azure.communication.callingserver.models.RecordingChannel;
+import com.azure.communication.callingserver.models.RecordingContent;
+import com.azure.communication.callingserver.models.RecordingFormat;
 import com.azure.communication.callingserver.models.StartRecordingOptions;
 import com.azure.communication.callingserver.implementation.models.ResultInfoInternal;
 import com.azure.communication.callingserver.models.AddParticipantResult;
@@ -47,9 +47,9 @@ public void startRecordingRelativeUriFails() {
     @Test
     public void startRecordingWithRecordingParamsRelativeUriFails() {
         StartRecordingOptions startRecordingOptions = new StartRecordingOptions();
-        startRecordingOptions.setRecordingChannelType(RecordingChannelType.MIXED);
-        startRecordingOptions.setRecordingContentType(RecordingContentType.AUDIO_VIDEO);
-        startRecordingOptions.setRecordingFormatType(RecordingFormatType.MP4);
+        startRecordingOptions.setRecordingChannel(RecordingChannel.MIXED);
+        startRecordingOptions.setRecordingContent(RecordingContent.AUDIO_VIDEO);
+        startRecordingOptions.setRecordingFormat(RecordingFormat.MP4);
 
         ServerCall serverCall = new CallingServerClientBuilder()
             .httpClient(new NoOpHttpClient())
@@ -105,9 +105,9 @@ public void startRecordingAsyncFails() {
     @Test
     public void startRecordingWithRecordingParamsAsyncFails() {
         StartRecordingOptions startRecordingOptions = new StartRecordingOptions();
-        startRecordingOptions.setRecordingChannelType(RecordingChannelType.MIXED);
-        startRecordingOptions.setRecordingContentType(RecordingContentType.AUDIO_VIDEO);
-        startRecordingOptions.setRecordingFormatType(RecordingFormatType.MP4);
+        startRecordingOptions.setRecordingChannel(RecordingChannel.MIXED);
+        startRecordingOptions.setRecordingContent(RecordingContent.AUDIO_VIDEO);
+        startRecordingOptions.setRecordingFormat(RecordingFormat.MP4);
 
         ServerCallAsync serverCall = new CallingServerClientBuilder()
             .httpClient(new NoOpHttpClient())
diff --git a/sdk/communication/azure-communication-callingserver/swagger/README.md b/sdk/communication/azure-communication-callingserver/swagger/README.md
index f73fd1f85077c..413eb12fd1b7c 100644
--- a/sdk/communication/azure-communication-callingserver/swagger/README.md
+++ b/sdk/communication/azure-communication-callingserver/swagger/README.md
@@ -94,5 +94,32 @@ directive:
     to: ResultInfoInternal
 - rename-model:
     from: ToneInfo
-    to: ToneInfoInternal                        
+    to: ToneInfoInternal                                            
 ```
+
+### Rename RecordingChannelType to RecordingChannel
+``` yaml
+directive:
+  - from: swagger-document
+    where: $.definitions.RecordingChannelType
+    transform: >
+      $["x-ms-enum"].name = "RecordingChannel";
+```
+
+### Rename RecordingContentType to RecordingContent
+``` yaml
+directive:
+  - from: swagger-document
+    where: $.definitions.RecordingContentType
+    transform: >
+      $["x-ms-enum"].name = "RecordingContent";
+```
+
+### Rename RecordingFormatType to RecordingFormat
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.RecordingFormatType["x-ms-enum"]
+  transform: >
+    $.name = "RecordingFormat";
+```
\ No newline at end of file