diff --git a/sdk/communication/Azure.Communication.Identity/api/Azure.Communication.Identity.netstandard2.0.cs b/sdk/communication/Azure.Communication.Identity/api/Azure.Communication.Identity.netstandard2.0.cs
index 18d12bfd0496f..5b93834db90a0 100644
--- a/sdk/communication/Azure.Communication.Identity/api/Azure.Communication.Identity.netstandard2.0.cs
+++ b/sdk/communication/Azure.Communication.Identity/api/Azure.Communication.Identity.netstandard2.0.cs
@@ -20,10 +20,10 @@ public CommunicationIdentityClient(System.Uri endpoint, Azure.Core.TokenCredenti
     }
     public partial class CommunicationIdentityClientOptions : Azure.Core.ClientOptions
     {
-        public CommunicationIdentityClientOptions(Azure.Communication.Identity.CommunicationIdentityClientOptions.ServiceVersion version = Azure.Communication.Identity.CommunicationIdentityClientOptions.ServiceVersion.V1) { }
+        public CommunicationIdentityClientOptions(Azure.Communication.Identity.CommunicationIdentityClientOptions.ServiceVersion version = Azure.Communication.Identity.CommunicationIdentityClientOptions.ServiceVersion.V2021_03_07) { }
         public enum ServiceVersion
         {
-            V1 = 1,
+            V2021_03_07 = 1,
         }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
diff --git a/sdk/communication/Azure.Communication.Identity/src/CommunicationIdentityClientOptions.cs b/sdk/communication/Azure.Communication.Identity/src/CommunicationIdentityClientOptions.cs
index 979679160fa75..e2dc4984980b2 100644
--- a/sdk/communication/Azure.Communication.Identity/src/CommunicationIdentityClientOptions.cs
+++ b/sdk/communication/Azure.Communication.Identity/src/CommunicationIdentityClientOptions.cs
@@ -12,9 +12,9 @@ namespace Azure.Communication.Identity
     public class CommunicationIdentityClientOptions : ClientOptions
     {
         /// <summary>
-        /// The latest version of the token service.
+        /// The latest version of the identity service.
         /// </summary>
-        internal const ServiceVersion LatestVersion = ServiceVersion.V1;
+        internal const ServiceVersion LatestVersion = ServiceVersion.V2021_03_07;
 
         internal string ApiVersion { get; }
 
@@ -25,7 +25,7 @@ public CommunicationIdentityClientOptions(ServiceVersion version = LatestVersion
         {
             ApiVersion = version switch
             {
-                ServiceVersion.V1 => "2021-03-07",
+                ServiceVersion.V2021_03_07 => "2021-03-07",
                 _ => throw new ArgumentOutOfRangeException(nameof(version)),
             };
         }
@@ -36,9 +36,11 @@ public CommunicationIdentityClientOptions(ServiceVersion version = LatestVersion
         public enum ServiceVersion
         {
             /// <summary>
-            /// The V1 of the token service.
+            /// The V2021_03_07 of the identity service.
             /// </summary>
-            V1 = 1
+#pragma warning disable CA1707 // Identifiers should not contain underscores
+            V2021_03_07 = 1,
+#pragma warning restore CA1707 // Identifiers should not contain underscores
         }
     }
 }