diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ClipTime.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ClipTime.cs
index eb4774b91b5c..834493c15d9b 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ClipTime.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ClipTime.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for specifying a clip time. Use sub classes of this class to
     /// specify the time position in the media.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ClipTime")]
     public partial class ClipTime
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Codec.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Codec.cs
index fb8819642665..3bc892769f90 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Codec.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Codec.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.Media.Models
     /// <summary>
     /// Describes the basic properties of all codecs.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("Codec")]
     public partial class Codec
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyConfiguration.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyConfiguration.cs
index eb9efcd089de..2b486a5b596f 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyConfiguration.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyConfiguration.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for Content Key Policy configuration. A derived class must
     /// be used to create a configuration.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ContentKeyPolicyConfiguration")]
     public partial class ContentKeyPolicyConfiguration
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyPlayReadyContentKeyLocation.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyPlayReadyContentKeyLocation.cs
index e5ce948790ce..6b3a19bb48cf 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyPlayReadyContentKeyLocation.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyPlayReadyContentKeyLocation.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for content key ID location. A derived class must be used to
     /// represent the location.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ContentKeyPolicyPlayReadyContentKeyLocation")]
     public partial class ContentKeyPolicyPlayReadyContentKeyLocation
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestriction.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestriction.cs
index df4ff5050dfd..0ab893f71380 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestriction.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestriction.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for Content Key Policy restrictions. A derived class must be
     /// used to create a restriction.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ContentKeyPolicyRestriction")]
     public partial class ContentKeyPolicyRestriction
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestrictionTokenKey.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestrictionTokenKey.cs
index 487b650ec8aa..1a9cc1e5542e 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestrictionTokenKey.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/ContentKeyPolicyRestrictionTokenKey.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for Content Key Policy key for token validation. A derived
     /// class must be used to create a token key.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ContentKeyPolicyRestrictionTokenKey")]
     public partial class ContentKeyPolicyRestrictionTokenKey
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Format.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Format.cs
index 4db5cacf646d..862d2daafded 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Format.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Format.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Management.Media.Models
     /// <summary>
     /// Base class for output.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("Format")]
     public partial class Format
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobInput.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobInput.cs
index ffdf3dc4b89b..c6d67ab0a0aa 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobInput.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobInput.cs
@@ -10,11 +10,13 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base class for inputs to a Job.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("JobInput")]
     public partial class JobInput
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobOutput.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobOutput.cs
index 2fa12234cd7c..3330e2a06a9c 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobOutput.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/JobOutput.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.Media.Models
     /// <summary>
     /// Describes all the properties of a JobOutput.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("JobOutput")]
     public partial class JobOutput
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Layer.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Layer.cs
index b1a9abb721e3..c7ff6fae2ab1 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Layer.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Layer.cs
@@ -19,6 +19,7 @@ namespace Microsoft.Azure.Management.Media.Models
     /// desired resolution. A layer represents the properties for the video or
     /// image at a resolution.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("Layer")]
     public partial class Layer
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Overlay.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Overlay.cs
index 2cf4cdbb69eb..2126c13d04f1 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Overlay.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Overlay.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Management.Media.Models
     /// <summary>
     /// Base type for all overlays - image, audio or video.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("Overlay")]
     public partial class Overlay
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Preset.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Preset.cs
index 6406af393cf0..72a6e2a97724 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Preset.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/Models/Preset.cs
@@ -10,12 +10,14 @@
 
 namespace Microsoft.Azure.Management.Media.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
     /// Base type for all Presets, which define the recipe or instructions on
     /// how the input media files should be processed.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("Preset")]
     public partial class Preset
     {
         /// <summary>
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/SdkInfo_AzureMediaServices.cs b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/SdkInfo_AzureMediaServices.cs
index bbcb20141ca5..2b049988b457 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/SdkInfo_AzureMediaServices.cs
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/Generated/SdkInfo_AzureMediaServices.cs
@@ -36,16 +36,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_AzureMediaServi
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4407";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/mediaservices/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --opt-in-extensible-enums --csharp-sdks-folder=D:\\GitHub\\giakasRepros\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "85d6e58c37868ca84f8f6eec5650dc4ab2d9a19a";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/generate.ps1 b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/generate.ps1
index 543bc23ee13b..d410a50000f5 100644
--- a/sdk/mediaservices/Microsoft.Azure.Management.Media/src/generate.ps1
+++ b/sdk/mediaservices/Microsoft.Azure.Management.Media/src/generate.ps1
@@ -1 +1 @@
-Start-AutoRestCodeGeneration -ResourceProvider "mediaservices/resource-manager" -AutoRestVersion "latest" -AutoRestCodeGenerationFlags --opt-in-extensible-enums
+Start-AutoRestCodeGeneration -ResourceProvider "mediaservices/resource-manager" -AutoRestVersion "v2" -AutoRestCodeGenerationFlags --opt-in-extensible-enums