diff --git a/azure-mgmt-media/HISTORY.rst b/azure-mgmt-media/HISTORY.rst
index a0a84033d4ad..24ce8046dc59 100644
--- a/azure-mgmt-media/HISTORY.rst
+++ b/azure-mgmt-media/HISTORY.rst
@@ -3,6 +3,22 @@
 Release History
 ===============
 
+1.0.0rc2 (2018-07-19)
++++++++++++++++++++++
+
+**Features**
+
+- Model LiveEventPreview has a new parameter alternative_media_id
+- Model StreamingLocator has a new parameter alternative_media_id
+- Model EnvelopeEncryption has a new parameter custom_key_acquisition_url_template
+- Model Job has a new parameter correlation_data
+
+**Breaking changes**
+
+- Model EnvelopeEncryption no longer has parameter custom_license_acquisition_url_template
+
+API version endpoint is now 2018-06-01-preview
+
 1.0.0rc1 (2018-04-23)
 +++++++++++++++++++++
 
@@ -11,6 +27,8 @@ Release History
 This is a complete rewriting of the package and a completly new RestAPI,
 and no compatibility at all is possible.
 
+API version endpoint is now 2018-03-30-preview
+
 0.2.0 (2017-09-14)
 ++++++++++++++++++
 
diff --git a/azure-mgmt-media/README.rst b/azure-mgmt-media/README.rst
index 0ed3e4508532..8c84a27e0f5b 100644
--- a/azure-mgmt-media/README.rst
+++ b/azure-mgmt-media/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure Media Services Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
diff --git a/azure-mgmt-media/azure/mgmt/media/azure_media_services.py b/azure-mgmt-media/azure/mgmt/media/azure_media_services.py
index c83e39f79f79..746a9a325e6d 100644
--- a/azure-mgmt-media/azure/mgmt/media/azure_media_services.py
+++ b/azure-mgmt-media/azure/mgmt/media/azure_media_services.py
@@ -108,7 +108,7 @@ def __init__(
         super(AzureMediaServices, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-03-30-preview'
+        self.api_version = '2018-06-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/__init__.py b/azure-mgmt-media/azure/mgmt/media/models/__init__.py
index b8412143ae31..d07fed7bfdb1 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/__init__.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/__init__.py
@@ -115,7 +115,6 @@
     from .common_encryption_cenc_py3 import CommonEncryptionCenc
     from .common_encryption_cbcs_py3 import CommonEncryptionCbcs
     from .streaming_policy_py3 import StreamingPolicy
-    from .streaming_locator_user_defined_content_key_py3 import StreamingLocatorUserDefinedContentKey
     from .streaming_locator_content_key_py3 import StreamingLocatorContentKey
     from .streaming_path_py3 import StreamingPath
     from .list_content_keys_response_py3 import ListContentKeysResponse
@@ -244,7 +243,6 @@
     from .common_encryption_cenc import CommonEncryptionCenc
     from .common_encryption_cbcs import CommonEncryptionCbcs
     from .streaming_policy import StreamingPolicy
-    from .streaming_locator_user_defined_content_key import StreamingLocatorUserDefinedContentKey
     from .streaming_locator_content_key import StreamingLocatorContentKey
     from .streaming_path import StreamingPath
     from .list_content_keys_response import ListContentKeysResponse
@@ -422,7 +420,6 @@
     'CommonEncryptionCenc',
     'CommonEncryptionCbcs',
     'StreamingPolicy',
-    'StreamingLocatorUserDefinedContentKey',
     'StreamingLocatorContentKey',
     'StreamingPath',
     'ListContentKeysResponse',
diff --git a/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py
index 991919b970fd..9e402b989806 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .audio import Audio
+from .audio_py3 import Audio
 
 
 class AacAudio(Audio):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/api_error.py b/azure-mgmt-media/azure/mgmt/media/models/api_error.py
index 0443e9b1e04a..2f1bcdff16e7 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/api_error.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/api_error.py
@@ -16,7 +16,7 @@
 class ApiError(Model):
     """The API error.
 
-    :param error: ApiError. The error properties.
+    :param error: The error properties.
     :type error: ~azure.mgmt.media.models.ODataError
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py b/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py
index ba67fd69a832..b73c93202d2b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py
@@ -16,7 +16,7 @@
 class ApiError(Model):
     """The API error.
 
-    :param error: ApiError. The error properties.
+    :param error: The error properties.
     :type error: ~azure.mgmt.media.models.ODataError
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py
index 527c64342a4c..fcf8ce56fd8c 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class Asset(ProxyResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py
index b7693bb95d79..2f0b32645a49 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .preset import Preset
+from .preset_py3 import Preset
 
 
 class AudioAnalyzerPreset(Preset):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py
index 6f19b62a2e6f..b8bf59476420 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .overlay import Overlay
+from .overlay_py3 import Overlay
 
 
 class AudioOverlay(Overlay):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py
index 37228c63f7bf..373ae47a86d5 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class Audio(Codec):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py
index 67b2657eddd7..c9e25be5cff7 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .preset import Preset
+from .preset_py3 import Preset
 
 
 class BuiltInStandardEncoderPreset(Preset):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py
index 2e5839b28835..564702848147 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py
@@ -13,10 +13,10 @@
 
 
 class CbcsDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCbcs scheme in
+    """Class to specify DRM configurations of CommonEncryptionCbcs scheme in
     Streaming Policy.
 
-    :param fair_play: Fairplay configurations
+    :param fair_play: FairPlay configurations
     :type fair_play:
      ~azure.mgmt.media.models.StreamingPolicyFairPlayConfiguration
     :param play_ready: PlayReady configurations
diff --git a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py
index 947e45d4d438..9c675227d218 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py
@@ -13,10 +13,10 @@
 
 
 class CbcsDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCbcs scheme in
+    """Class to specify DRM configurations of CommonEncryptionCbcs scheme in
     Streaming Policy.
 
-    :param fair_play: Fairplay configurations
+    :param fair_play: FairPlay configurations
     :type fair_play:
      ~azure.mgmt.media.models.StreamingPolicyFairPlayConfiguration
     :param play_ready: PlayReady configurations
diff --git a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py
index afb72193dd4e..28e0d535dded 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py
@@ -13,7 +13,7 @@
 
 
 class CencDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCenc scheme in
+    """Class to specify DRM configurations of CommonEncryptionCenc scheme in
     Streaming Policy.
 
     :param play_ready: PlayReady configurations
diff --git a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py
index 40111ae76dbe..e72bff93ebbc 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py
@@ -13,7 +13,7 @@
 
 
 class CencDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCenc scheme in
+    """Class to specify DRM configurations of CommonEncryptionCenc scheme in
     Streaming Policy.
 
     :param play_ready: PlayReady configurations
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py
index a596361089ab..436fd3dac992 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyClearKeyConfiguration(ContentKeyPolicyConfiguration):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py
index e9b5874dbeed..b0e4cb88d280 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyFairPlayConfiguration(ContentKeyPolicyConfiguration):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py
index e044f9b8359d..3fca48a998ef 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyOpenRestriction(ContentKeyPolicyRestriction):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py
index 7175fc1363e0..586f874a5a6d 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyPlayReadyConfiguration(ContentKeyPolicyConfiguration):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py
index 5865cdd2d236..fb0532bbdbe7 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_play_ready_content_key_location import ContentKeyPolicyPlayReadyContentKeyLocation
+from .content_key_policy_play_ready_content_key_location_py3 import ContentKeyPolicyPlayReadyContentKeyLocation
 
 
 class ContentKeyPolicyPlayReadyContentEncryptionKeyFromHeader(ContentKeyPolicyPlayReadyContentKeyLocation):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py
index 029d2b9c94ee..9e3cbc177153 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_play_ready_content_key_location import ContentKeyPolicyPlayReadyContentKeyLocation
+from .content_key_policy_play_ready_content_key_location_py3 import ContentKeyPolicyPlayReadyContentKeyLocation
 
 
 class ContentKeyPolicyPlayReadyContentEncryptionKeyFromKeyIdentifier(ContentKeyPolicyPlayReadyContentKeyLocation):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py
index d1a81826d1c7..8d96e1b8953f 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class ContentKeyPolicy(ProxyResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py
index 69269fa1aea6..beaae41e76ac 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicyRsaTokenKey(ContentKeyPolicyRestrictionTokenKey):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py
index b5c840688a6c..ab0fe70a3eb3 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicySymmetricTokenKey(ContentKeyPolicyRestrictionTokenKey):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py
index df0bd1ea0497..0bb50a7b5ec8 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyTokenRestriction(ContentKeyPolicyRestriction):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py
index 51c16ae5ce44..7cd968b4e470 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyUnknownConfiguration(ContentKeyPolicyConfiguration):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py
index 5ee3bd91f59c..5e399a52ff61 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyUnknownRestriction(ContentKeyPolicyRestriction):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py
index 3a4f59afa72d..dfa5937c8553 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyWidevineConfiguration(ContentKeyPolicyConfiguration):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py
index 8e8b5c21bbd8..71fbe3a3aa20 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicyX509CertificateTokenKey(ContentKeyPolicyRestrictionTokenKey):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py
index 1a95b7f07e32..3317729d5bed 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class CopyAudio(Codec):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py b/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py
index 14bf51cdbc3f..359adcea40fb 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class CopyVideo(Codec):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/default_key.py b/azure-mgmt-media/azure/mgmt/media/models/default_key.py
index 99a8cdfb74d1..4e44c96fdee6 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/default_key.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/default_key.py
@@ -16,8 +16,8 @@ class DefaultKey(Model):
     """Class to specify properties of default content key for each encryption
     scheme.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Default Key
     :type policy_name: str
diff --git a/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py
index 13ab0eccc9c3..9dd748a97a9b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py
@@ -16,8 +16,8 @@ class DefaultKey(Model):
     """Class to specify properties of default content key for each encryption
     scheme.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Default Key
     :type policy_name: str
diff --git a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py
index ec43221a533f..c19ef9e6c19b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py
@@ -19,9 +19,9 @@ class EnabledProtocols(Model):
 
     :param download: Required. Enable Download protocol or not
     :type download: bool
-    :param dash: Required. Enable Dash protocol or not
+    :param dash: Required. Enable DASH protocol or not
     :type dash: bool
-    :param hls: Required. Enable Hls protocol or not
+    :param hls: Required. Enable HLS protocol or not
     :type hls: bool
     :param smooth_streaming: Required. Enable SmoothStreaming protocol or not
     :type smooth_streaming: bool
diff --git a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py
index 09808553b6d4..7dd6c08c651b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py
@@ -19,9 +19,9 @@ class EnabledProtocols(Model):
 
     :param download: Required. Enable Download protocol or not
     :type download: bool
-    :param dash: Required. Enable Dash protocol or not
+    :param dash: Required. Enable DASH protocol or not
     :type dash: bool
-    :param hls: Required. Enable Hls protocol or not
+    :param hls: Required. Enable HLS protocol or not
     :type hls: bool
     :param smooth_streaming: Required. Enable SmoothStreaming protocol or not
     :type smooth_streaming: bool
diff --git a/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption.py b/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption.py
index 6d2e7ff590c1..09e7f14561ba 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption.py
@@ -22,17 +22,16 @@ class EnvelopeEncryption(Model):
     :param content_keys: Representing default content key for each encryption
      scheme and separate content keys for specific tracks
     :type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
-    :param custom_license_acquisition_url_template:
-     LicenseAcquistionUrlTemplate is used to point to user speicified service
-     to delivery content keys
-    :type custom_license_acquisition_url_template: str
+    :param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
+     used to point to user specified service to delivery content keys
+    :type custom_key_acquisition_url_template: str
     """
 
     _attribute_map = {
         'enabled_protocols': {'key': 'enabledProtocols', 'type': 'EnabledProtocols'},
         'clear_tracks': {'key': 'clearTracks', 'type': '[TrackSelection]'},
         'content_keys': {'key': 'contentKeys', 'type': 'StreamingPolicyContentKeys'},
-        'custom_license_acquisition_url_template': {'key': 'customLicenseAcquisitionUrlTemplate', 'type': 'str'},
+        'custom_key_acquisition_url_template': {'key': 'customKeyAcquisitionUrlTemplate', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -40,4 +39,4 @@ def __init__(self, **kwargs):
         self.enabled_protocols = kwargs.get('enabled_protocols', None)
         self.clear_tracks = kwargs.get('clear_tracks', None)
         self.content_keys = kwargs.get('content_keys', None)
-        self.custom_license_acquisition_url_template = kwargs.get('custom_license_acquisition_url_template', None)
+        self.custom_key_acquisition_url_template = kwargs.get('custom_key_acquisition_url_template', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption_py3.py b/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption_py3.py
index 12bdba13b5a8..c10997242d87 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/envelope_encryption_py3.py
@@ -22,22 +22,21 @@ class EnvelopeEncryption(Model):
     :param content_keys: Representing default content key for each encryption
      scheme and separate content keys for specific tracks
     :type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
-    :param custom_license_acquisition_url_template:
-     LicenseAcquistionUrlTemplate is used to point to user speicified service
-     to delivery content keys
-    :type custom_license_acquisition_url_template: str
+    :param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
+     used to point to user specified service to delivery content keys
+    :type custom_key_acquisition_url_template: str
     """
 
     _attribute_map = {
         'enabled_protocols': {'key': 'enabledProtocols', 'type': 'EnabledProtocols'},
         'clear_tracks': {'key': 'clearTracks', 'type': '[TrackSelection]'},
         'content_keys': {'key': 'contentKeys', 'type': 'StreamingPolicyContentKeys'},
-        'custom_license_acquisition_url_template': {'key': 'customLicenseAcquisitionUrlTemplate', 'type': 'str'},
+        'custom_key_acquisition_url_template': {'key': 'customKeyAcquisitionUrlTemplate', 'type': 'str'},
     }
 
-    def __init__(self, *, enabled_protocols=None, clear_tracks=None, content_keys=None, custom_license_acquisition_url_template: str=None, **kwargs) -> None:
+    def __init__(self, *, enabled_protocols=None, clear_tracks=None, content_keys=None, custom_key_acquisition_url_template: str=None, **kwargs) -> None:
         super(EnvelopeEncryption, self).__init__(**kwargs)
         self.enabled_protocols = enabled_protocols
         self.clear_tracks = clear_tracks
         self.content_keys = content_keys
-        self.custom_license_acquisition_url_template = custom_license_acquisition_url_template
+        self.custom_key_acquisition_url_template = custom_key_acquisition_url_template
diff --git a/azure-mgmt-media/azure/mgmt/media/models/h264_layer_py3.py b/azure-mgmt-media/azure/mgmt/media/models/h264_layer_py3.py
index 1ad86fef90ce..ffe0bcca3fc4 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/h264_layer_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/h264_layer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .video_layer import VideoLayer
+from .video_layer_py3 import VideoLayer
 
 
 class H264Layer(VideoLayer):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/h264_video_py3.py b/azure-mgmt-media/azure/mgmt/media/models/h264_video_py3.py
index 842844901aef..f270a1d72bf4 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/h264_video_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/h264_video_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .video import Video
+from .video_py3 import Video
 
 
 class H264Video(Video):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/image_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/image_format_py3.py
index d716271dcb74..7095adc370dd 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/image_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/image_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .format import Format
+from .format_py3 import Format
 
 
 class ImageFormat(Format):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/image_py3.py b/azure-mgmt-media/azure/mgmt/media/models/image_py3.py
index dceb69bd0b2f..eb9bf2628603 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/image_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .video import Video
+from .video_py3 import Video
 
 
 class Image(Video):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job.py b/azure-mgmt-media/azure/mgmt/media/models/job.py
index 42083779572e..24dd1a3ad3f6 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job.py
@@ -47,6 +47,9 @@ class Job(ProxyResource):
      priority jobs are processed before lower priority jobs. If not set, the
      default is normal. Possible values include: 'Low', 'Normal', 'High'
     :type priority: str or ~azure.mgmt.media.models.Priority
+    :param correlation_data: Customer provided correlation data that will be
+     returned in Job completed events.
+    :type correlation_data: dict[str, str]
     """
 
     _validation = {
@@ -71,6 +74,7 @@ class Job(ProxyResource):
         'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'},
         'outputs': {'key': 'properties.outputs', 'type': '[JobOutput]'},
         'priority': {'key': 'properties.priority', 'type': 'Priority'},
+        'correlation_data': {'key': 'properties.correlationData', 'type': '{str}'},
     }
 
     def __init__(self, **kwargs):
@@ -82,3 +86,4 @@ def __init__(self, **kwargs):
         self.last_modified = None
         self.outputs = kwargs.get('outputs', None)
         self.priority = kwargs.get('priority', None)
+        self.correlation_data = kwargs.get('correlation_data', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py
index 0703fd35aa2b..0bb6932fa19b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .job_input_clip import JobInputClip
+from .job_input_clip_py3 import JobInputClip
 
 
 class JobInputAsset(JobInputClip):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py
index fbb1655b5abd..69f390a41eac 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .job_input import JobInput
+from .job_input_py3 import JobInput
 
 
 class JobInputClip(JobInput):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py
index b7ecae1e8c51..7dda64a529c6 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .job_input_clip import JobInputClip
+from .job_input_clip_py3 import JobInputClip
 
 
 class JobInputHttp(JobInputClip):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_inputs_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_inputs_py3.py
index 45e1b3d9e5d2..2b81a299310b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_inputs_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_inputs_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .job_input import JobInput
+from .job_input_py3 import JobInput
 
 
 class JobInputs(JobInput):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_output_asset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_output_asset_py3.py
index c950e0617896..562b6353687e 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_output_asset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_output_asset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .job_output import JobOutput
+from .job_output_py3 import JobOutput
 
 
 class JobOutputAsset(JobOutput):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/job_py3.py b/azure-mgmt-media/azure/mgmt/media/models/job_py3.py
index 5caba3753703..34f35a4eb8aa 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/job_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/job_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class Job(ProxyResource):
@@ -47,6 +47,9 @@ class Job(ProxyResource):
      priority jobs are processed before lower priority jobs. If not set, the
      default is normal. Possible values include: 'Low', 'Normal', 'High'
     :type priority: str or ~azure.mgmt.media.models.Priority
+    :param correlation_data: Customer provided correlation data that will be
+     returned in Job completed events.
+    :type correlation_data: dict[str, str]
     """
 
     _validation = {
@@ -71,9 +74,10 @@ class Job(ProxyResource):
         'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'},
         'outputs': {'key': 'properties.outputs', 'type': '[JobOutput]'},
         'priority': {'key': 'properties.priority', 'type': 'Priority'},
+        'correlation_data': {'key': 'properties.correlationData', 'type': '{str}'},
     }
 
-    def __init__(self, *, input, outputs, description: str=None, priority=None, **kwargs) -> None:
+    def __init__(self, *, input, outputs, description: str=None, priority=None, correlation_data=None, **kwargs) -> None:
         super(Job, self).__init__(**kwargs)
         self.created = None
         self.state = None
@@ -82,3 +86,4 @@ def __init__(self, *, input, outputs, description: str=None, priority=None, **kw
         self.last_modified = None
         self.outputs = outputs
         self.priority = priority
+        self.correlation_data = correlation_data
diff --git a/azure-mgmt-media/azure/mgmt/media/models/jpg_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/jpg_format_py3.py
index 61cd483e9227..a8384445c006 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/jpg_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/jpg_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .image_format import ImageFormat
+from .image_format_py3 import ImageFormat
 
 
 class JpgFormat(ImageFormat):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/jpg_image_py3.py b/azure-mgmt-media/azure/mgmt/media/models/jpg_image_py3.py
index f0fc3f51345a..6af817f905be 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/jpg_image_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/jpg_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .image import Image
+from .image_py3 import Image
 
 
 class JpgImage(Image):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/jpg_layer_py3.py b/azure-mgmt-media/azure/mgmt/media/models/jpg_layer_py3.py
index 658ac275f60a..1379442b6ca2 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/jpg_layer_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/jpg_layer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .layer import Layer
+from .layer_py3 import Layer
 
 
 class JpgLayer(Layer):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/live_event_preview.py b/azure-mgmt-media/azure/mgmt/media/models/live_event_preview.py
index 2142f3d5d5a0..4e7aca455f41 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/live_event_preview.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/live_event_preview.py
@@ -25,6 +25,12 @@ class LiveEventPreview(Model):
     :param streaming_policy_name: The name of streaming policy used for
      LiveEvent preview
     :type streaming_policy_name: str
+    :param alternative_media_id: An Alternative Media Identifier associated
+     with the preview url.  This identifier can be used to distinguish the
+     preview of different live events for authorization purposes in the
+     CustomLicenseAcquisitionUrlTemplate or the CustomKeyAcquisitionUrlTemplate
+     of the StreamingPolicy specified in the StreamingPolicyName field.
+    :type alternative_media_id: str
     """
 
     _attribute_map = {
@@ -32,6 +38,7 @@ class LiveEventPreview(Model):
         'access_control': {'key': 'accessControl', 'type': 'LiveEventPreviewAccessControl'},
         'preview_locator': {'key': 'previewLocator', 'type': 'str'},
         'streaming_policy_name': {'key': 'streamingPolicyName', 'type': 'str'},
+        'alternative_media_id': {'key': 'alternativeMediaId', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -40,3 +47,4 @@ def __init__(self, **kwargs):
         self.access_control = kwargs.get('access_control', None)
         self.preview_locator = kwargs.get('preview_locator', None)
         self.streaming_policy_name = kwargs.get('streaming_policy_name', None)
+        self.alternative_media_id = kwargs.get('alternative_media_id', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/live_event_preview_py3.py b/azure-mgmt-media/azure/mgmt/media/models/live_event_preview_py3.py
index 77417cd3a8b8..c071c9854d95 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/live_event_preview_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/live_event_preview_py3.py
@@ -25,6 +25,12 @@ class LiveEventPreview(Model):
     :param streaming_policy_name: The name of streaming policy used for
      LiveEvent preview
     :type streaming_policy_name: str
+    :param alternative_media_id: An Alternative Media Identifier associated
+     with the preview url.  This identifier can be used to distinguish the
+     preview of different live events for authorization purposes in the
+     CustomLicenseAcquisitionUrlTemplate or the CustomKeyAcquisitionUrlTemplate
+     of the StreamingPolicy specified in the StreamingPolicyName field.
+    :type alternative_media_id: str
     """
 
     _attribute_map = {
@@ -32,11 +38,13 @@ class LiveEventPreview(Model):
         'access_control': {'key': 'accessControl', 'type': 'LiveEventPreviewAccessControl'},
         'preview_locator': {'key': 'previewLocator', 'type': 'str'},
         'streaming_policy_name': {'key': 'streamingPolicyName', 'type': 'str'},
+        'alternative_media_id': {'key': 'alternativeMediaId', 'type': 'str'},
     }
 
-    def __init__(self, *, endpoints=None, access_control=None, preview_locator: str=None, streaming_policy_name: str=None, **kwargs) -> None:
+    def __init__(self, *, endpoints=None, access_control=None, preview_locator: str=None, streaming_policy_name: str=None, alternative_media_id: str=None, **kwargs) -> None:
         super(LiveEventPreview, self).__init__(**kwargs)
         self.endpoints = endpoints
         self.access_control = access_control
         self.preview_locator = preview_locator
         self.streaming_policy_name = streaming_policy_name
+        self.alternative_media_id = alternative_media_id
diff --git a/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py b/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py
index 1a977c651869..62878a1aab90 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class LiveEvent(TrackedResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py b/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py
index 092fc3c6b15c..f5e5682d05a7 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class LiveOutput(ProxyResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/media_service_py3.py b/azure-mgmt-media/azure/mgmt/media/models/media_service_py3.py
index abc13101c0eb..17a18f0f93db 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/media_service_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/media_service_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class MediaService(TrackedResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/mp4_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/mp4_format_py3.py
index 8c9ccaee7b97..bd731424b19f 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/mp4_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/mp4_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .multi_bitrate_format import MultiBitrateFormat
+from .multi_bitrate_format_py3 import MultiBitrateFormat
 
 
 class Mp4Format(MultiBitrateFormat):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/multi_bitrate_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/multi_bitrate_format_py3.py
index 9c8681f1788f..9e3e7534afaa 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/multi_bitrate_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/multi_bitrate_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .format import Format
+from .format_py3 import Format
 
 
 class MultiBitrateFormat(Format):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/png_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/png_format_py3.py
index 6367b928237f..ad06a3511b03 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/png_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/png_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .image_format import ImageFormat
+from .image_format_py3 import ImageFormat
 
 
 class PngFormat(ImageFormat):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/png_image_py3.py b/azure-mgmt-media/azure/mgmt/media/models/png_image_py3.py
index 728b02b60adc..fab7ae13409a 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/png_image_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/png_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .image import Image
+from .image_py3 import Image
 
 
 class PngImage(Image):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/png_layer_py3.py b/azure-mgmt-media/azure/mgmt/media/models/png_layer_py3.py
index 8d95e237525a..1dd03ac3857b 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/png_layer_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/png_layer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .layer import Layer
+from .layer_py3 import Layer
 
 
 class PngLayer(Layer):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/proxy_resource_py3.py b/azure-mgmt-media/azure/mgmt/media/models/proxy_resource_py3.py
index c388d2bc97bc..2bfbcd84d6f0 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/proxy_resource_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/proxy_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ProxyResource(Resource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/standard_encoder_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/standard_encoder_preset_py3.py
index 6b0956140ff0..9a53ddbe400a 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/standard_encoder_preset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/standard_encoder_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .preset import Preset
+from .preset_py3 import Preset
 
 
 class StandardEncoderPreset(Preset):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py
index 62abafc6da5a..111e28e6e79f 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class StreamingEndpoint(TrackedResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator.py
index 0322f94069ac..c33ebff92bc8 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator.py
@@ -49,7 +49,14 @@ class StreamingLocator(ProxyResource):
     :type default_content_key_policy_name: str
     :param content_keys: ContentKeys used by this Streaming Locator
     :type content_keys:
-     list[~azure.mgmt.media.models.StreamingLocatorUserDefinedContentKey]
+     list[~azure.mgmt.media.models.StreamingLocatorContentKey]
+    :param alternative_media_id: An Alternative Media Identifier associated
+     with the StreamingLocator.  This identifier can be used to distinguish
+     different StreamingLocators for the same Asset for authorization purposes
+     in the CustomLicenseAcquisitionUrlTemplate or the
+     CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the
+     StreamingPolicyName field.
+    :type alternative_media_id: str
     """
 
     _validation = {
@@ -72,7 +79,8 @@ class StreamingLocator(ProxyResource):
         'streaming_locator_id': {'key': 'properties.streamingLocatorId', 'type': 'str'},
         'streaming_policy_name': {'key': 'properties.streamingPolicyName', 'type': 'str'},
         'default_content_key_policy_name': {'key': 'properties.defaultContentKeyPolicyName', 'type': 'str'},
-        'content_keys': {'key': 'properties.contentKeys', 'type': '[StreamingLocatorUserDefinedContentKey]'},
+        'content_keys': {'key': 'properties.contentKeys', 'type': '[StreamingLocatorContentKey]'},
+        'alternative_media_id': {'key': 'properties.alternativeMediaId', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -85,3 +93,4 @@ def __init__(self, **kwargs):
         self.streaming_policy_name = kwargs.get('streaming_policy_name', None)
         self.default_content_key_policy_name = kwargs.get('default_content_key_policy_name', None)
         self.content_keys = kwargs.get('content_keys', None)
+        self.alternative_media_id = kwargs.get('alternative_media_id', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key.py
index 1b33c4a9f6f4..2c03ee059d94 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key.py
@@ -15,33 +15,37 @@
 class StreamingLocatorContentKey(Model):
     """Class for content key in Streaming Locator.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
-    :param label: Label of Content Key
-    :type label: str
-    :param type: Required. Encryption type of Content Key. Possible values
-     include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs',
-     'EnvelopeEncryption'
-    :type type: str or ~azure.mgmt.media.models.StreamingLocatorContentKeyType
     :param id: Required. ID of Content Key
     :type id: str
+    :ivar type: Encryption type of Content Key. Possible values include:
+     'CommonEncryptionCenc', 'CommonEncryptionCbcs', 'EnvelopeEncryption'
+    :vartype type: str or
+     ~azure.mgmt.media.models.StreamingLocatorContentKeyType
+    :param label: Label of Content Key
+    :type label: str
     :param value: Value of  of Content Key
     :type value: str
-    :param policy_name: ContentKeyPolicy used by Content Key
-    :type policy_name: str
+    :ivar policy_name: ContentKeyPolicy used by Content Key
+    :vartype policy_name: str
     :param tracks: Tracks which use this Content Key
     :type tracks: list[~azure.mgmt.media.models.TrackSelection]
     """
 
     _validation = {
-        'type': {'required': True},
         'id': {'required': True},
+        'type': {'readonly': True},
+        'policy_name': {'readonly': True},
     }
 
     _attribute_map = {
-        'label': {'key': 'label', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'StreamingLocatorContentKeyType'},
         'id': {'key': 'id', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'StreamingLocatorContentKeyType'},
+        'label': {'key': 'label', 'type': 'str'},
         'value': {'key': 'value', 'type': 'str'},
         'policy_name': {'key': 'policyName', 'type': 'str'},
         'tracks': {'key': 'tracks', 'type': '[TrackSelection]'},
@@ -49,9 +53,9 @@ class StreamingLocatorContentKey(Model):
 
     def __init__(self, **kwargs):
         super(StreamingLocatorContentKey, self).__init__(**kwargs)
-        self.label = kwargs.get('label', None)
-        self.type = kwargs.get('type', None)
         self.id = kwargs.get('id', None)
+        self.type = None
+        self.label = kwargs.get('label', None)
         self.value = kwargs.get('value', None)
-        self.policy_name = kwargs.get('policy_name', None)
+        self.policy_name = None
         self.tracks = kwargs.get('tracks', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key_py3.py
index 20be2f643d7c..a905b73f3c8e 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_content_key_py3.py
@@ -15,43 +15,47 @@
 class StreamingLocatorContentKey(Model):
     """Class for content key in Streaming Locator.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
-    :param label: Label of Content Key
-    :type label: str
-    :param type: Required. Encryption type of Content Key. Possible values
-     include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs',
-     'EnvelopeEncryption'
-    :type type: str or ~azure.mgmt.media.models.StreamingLocatorContentKeyType
     :param id: Required. ID of Content Key
     :type id: str
+    :ivar type: Encryption type of Content Key. Possible values include:
+     'CommonEncryptionCenc', 'CommonEncryptionCbcs', 'EnvelopeEncryption'
+    :vartype type: str or
+     ~azure.mgmt.media.models.StreamingLocatorContentKeyType
+    :param label: Label of Content Key
+    :type label: str
     :param value: Value of  of Content Key
     :type value: str
-    :param policy_name: ContentKeyPolicy used by Content Key
-    :type policy_name: str
+    :ivar policy_name: ContentKeyPolicy used by Content Key
+    :vartype policy_name: str
     :param tracks: Tracks which use this Content Key
     :type tracks: list[~azure.mgmt.media.models.TrackSelection]
     """
 
     _validation = {
-        'type': {'required': True},
         'id': {'required': True},
+        'type': {'readonly': True},
+        'policy_name': {'readonly': True},
     }
 
     _attribute_map = {
-        'label': {'key': 'label', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'StreamingLocatorContentKeyType'},
         'id': {'key': 'id', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'StreamingLocatorContentKeyType'},
+        'label': {'key': 'label', 'type': 'str'},
         'value': {'key': 'value', 'type': 'str'},
         'policy_name': {'key': 'policyName', 'type': 'str'},
         'tracks': {'key': 'tracks', 'type': '[TrackSelection]'},
     }
 
-    def __init__(self, *, type, id: str, label: str=None, value: str=None, policy_name: str=None, tracks=None, **kwargs) -> None:
+    def __init__(self, *, id: str, label: str=None, value: str=None, tracks=None, **kwargs) -> None:
         super(StreamingLocatorContentKey, self).__init__(**kwargs)
-        self.label = label
-        self.type = type
         self.id = id
+        self.type = None
+        self.label = label
         self.value = value
-        self.policy_name = policy_name
+        self.policy_name = None
         self.tracks = tracks
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_py3.py
index deb0e31e7cf5..9d260824f2fd 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class StreamingLocator(ProxyResource):
@@ -49,7 +49,14 @@ class StreamingLocator(ProxyResource):
     :type default_content_key_policy_name: str
     :param content_keys: ContentKeys used by this Streaming Locator
     :type content_keys:
-     list[~azure.mgmt.media.models.StreamingLocatorUserDefinedContentKey]
+     list[~azure.mgmt.media.models.StreamingLocatorContentKey]
+    :param alternative_media_id: An Alternative Media Identifier associated
+     with the StreamingLocator.  This identifier can be used to distinguish
+     different StreamingLocators for the same Asset for authorization purposes
+     in the CustomLicenseAcquisitionUrlTemplate or the
+     CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the
+     StreamingPolicyName field.
+    :type alternative_media_id: str
     """
 
     _validation = {
@@ -72,10 +79,11 @@ class StreamingLocator(ProxyResource):
         'streaming_locator_id': {'key': 'properties.streamingLocatorId', 'type': 'str'},
         'streaming_policy_name': {'key': 'properties.streamingPolicyName', 'type': 'str'},
         'default_content_key_policy_name': {'key': 'properties.defaultContentKeyPolicyName', 'type': 'str'},
-        'content_keys': {'key': 'properties.contentKeys', 'type': '[StreamingLocatorUserDefinedContentKey]'},
+        'content_keys': {'key': 'properties.contentKeys', 'type': '[StreamingLocatorContentKey]'},
+        'alternative_media_id': {'key': 'properties.alternativeMediaId', 'type': 'str'},
     }
 
-    def __init__(self, *, asset_name: str, streaming_policy_name: str, start_time=None, end_time=None, streaming_locator_id: str=None, default_content_key_policy_name: str=None, content_keys=None, **kwargs) -> None:
+    def __init__(self, *, asset_name: str, streaming_policy_name: str, start_time=None, end_time=None, streaming_locator_id: str=None, default_content_key_policy_name: str=None, content_keys=None, alternative_media_id: str=None, **kwargs) -> None:
         super(StreamingLocator, self).__init__(**kwargs)
         self.asset_name = asset_name
         self.created = None
@@ -85,3 +93,4 @@ def __init__(self, *, asset_name: str, streaming_policy_name: str, start_time=No
         self.streaming_policy_name = streaming_policy_name
         self.default_content_key_policy_name = default_content_key_policy_name
         self.content_keys = content_keys
+        self.alternative_media_id = alternative_media_id
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key.py
deleted file mode 100644
index 730f76df963e..000000000000
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------
-
-from msrest.serialization import Model
-
-
-class StreamingLocatorUserDefinedContentKey(Model):
-    """Describes the properties of a user-defined content key in the Streaming
-    Locator.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Required. ID of Content Key
-    :type id: str
-    :param label: The Content Key description
-    :type label: str
-    :param value: The Content Key secret
-    :type value: str
-    """
-
-    _validation = {
-        'id': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'label': {'key': 'label', 'type': 'str'},
-        'value': {'key': 'value', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(StreamingLocatorUserDefinedContentKey, self).__init__(**kwargs)
-        self.id = kwargs.get('id', None)
-        self.label = kwargs.get('label', None)
-        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key_py3.py
deleted file mode 100644
index 696f236c7110..000000000000
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_locator_user_defined_content_key_py3.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------
-
-from msrest.serialization import Model
-
-
-class StreamingLocatorUserDefinedContentKey(Model):
-    """Describes the properties of a user-defined content key in the Streaming
-    Locator.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Required. ID of Content Key
-    :type id: str
-    :param label: The Content Key description
-    :type label: str
-    :param value: The Content Key secret
-    :type value: str
-    """
-
-    _validation = {
-        'id': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'label': {'key': 'label', 'type': 'str'},
-        'value': {'key': 'value', 'type': 'str'},
-    }
-
-    def __init__(self, *, id: str, label: str=None, value: str=None, **kwargs) -> None:
-        super(StreamingLocatorUserDefinedContentKey, self).__init__(**kwargs)
-        self.id = id
-        self.label = label
-        self.value = value
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy.py
index 76df81eea403..260d68972a37 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy.py
@@ -37,7 +37,7 @@ class StreamingPolicy(ProxyResource):
     :param common_encryption_cbcs: Configuration of CommonEncryptionCbcs
     :type common_encryption_cbcs:
      ~azure.mgmt.media.models.CommonEncryptionCbcs
-    :param no_encryption: Configuations of NoEncryption
+    :param no_encryption: Configurations of NoEncryption
     :type no_encryption: ~azure.mgmt.media.models.NoEncryption
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key.py
index 43fcf3b438d8..16127b9be942 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key.py
@@ -15,8 +15,8 @@
 class StreamingPolicyContentKey(Model):
     """Class to specify properties of content key.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Content Key
     :type policy_name: str
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key_py3.py
index 12555d034171..4d8772b15a9c 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_key_py3.py
@@ -15,8 +15,8 @@
 class StreamingPolicyContentKey(Model):
     """Class to specify properties of content key.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Content Key
     :type policy_name: str
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys.py
index 61b5e44ee016..8425663f79fa 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys.py
@@ -17,7 +17,7 @@ class StreamingPolicyContentKeys(Model):
 
     :param default_key: Default content key for an encryption scheme
     :type default_key: ~azure.mgmt.media.models.DefaultKey
-    :param key_to_track_mappings: Representing tracks needs sepearete content
+    :param key_to_track_mappings: Representing tracks needs separate content
      key
     :type key_to_track_mappings:
      list[~azure.mgmt.media.models.StreamingPolicyContentKey]
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys_py3.py
index 8a179e4263c0..d37020aa89b4 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_content_keys_py3.py
@@ -17,7 +17,7 @@ class StreamingPolicyContentKeys(Model):
 
     :param default_key: Default content key for an encryption scheme
     :type default_key: ~azure.mgmt.media.models.DefaultKey
-    :param key_to_track_mappings: Representing tracks needs sepearete content
+    :param key_to_track_mappings: Representing tracks needs separate content
      key
     :type key_to_track_mappings:
      list[~azure.mgmt.media.models.StreamingPolicyContentKey]
diff --git a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_py3.py b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_py3.py
index 4f824de2f6b8..fbb416a37f4f 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/streaming_policy_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class StreamingPolicy(ProxyResource):
@@ -37,7 +37,7 @@ class StreamingPolicy(ProxyResource):
     :param common_encryption_cbcs: Configuration of CommonEncryptionCbcs
     :type common_encryption_cbcs:
      ~azure.mgmt.media.models.CommonEncryptionCbcs
-    :param no_encryption: Configuations of NoEncryption
+    :param no_encryption: Configurations of NoEncryption
     :type no_encryption: ~azure.mgmt.media.models.NoEncryption
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/subscription_media_service_py3.py b/azure-mgmt-media/azure/mgmt/media/models/subscription_media_service_py3.py
index 710131af7490..fc5df9e2748e 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/subscription_media_service_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/subscription_media_service_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class SubscriptionMediaService(TrackedResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/track_property_condition.py b/azure-mgmt-media/azure/mgmt/media/models/track_property_condition.py
index 489a7e16bc24..f1468071d29c 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/track_property_condition.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/track_property_condition.py
@@ -24,7 +24,7 @@ class TrackPropertyCondition(Model):
      values include: 'Unknown', 'Equal'
     :type operation: str or
      ~azure.mgmt.media.models.TrackPropertyCompareOperation
-    :param value: Track proprty value
+    :param value: Track property value
     :type value: str
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/track_property_condition_py3.py b/azure-mgmt-media/azure/mgmt/media/models/track_property_condition_py3.py
index 3752ce9b0964..c2d511df8e95 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/track_property_condition_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/track_property_condition_py3.py
@@ -24,7 +24,7 @@ class TrackPropertyCondition(Model):
      values include: 'Unknown', 'Equal'
     :type operation: str or
      ~azure.mgmt.media.models.TrackPropertyCompareOperation
-    :param value: Track proprty value
+    :param value: Track property value
     :type value: str
     """
 
diff --git a/azure-mgmt-media/azure/mgmt/media/models/tracked_resource_py3.py b/azure-mgmt-media/azure/mgmt/media/models/tracked_resource_py3.py
index fd858ef56928..eb2905a866a2 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/tracked_resource_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/tracked_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TrackedResource(Resource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/transform_py3.py b/azure-mgmt-media/azure/mgmt/media/models/transform_py3.py
index b7e6750d7414..db6779ca4aed 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/transform_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/transform_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class Transform(ProxyResource):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/transport_stream_format_py3.py b/azure-mgmt-media/azure/mgmt/media/models/transport_stream_format_py3.py
index 4b5505a0a05a..779febd2957c 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/transport_stream_format_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/transport_stream_format_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .multi_bitrate_format import MultiBitrateFormat
+from .multi_bitrate_format_py3 import MultiBitrateFormat
 
 
 class TransportStreamFormat(MultiBitrateFormat):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py
index 4718680a6f81..39ae967e81a4 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .audio_analyzer_preset import AudioAnalyzerPreset
+from .audio_analyzer_preset_py3 import AudioAnalyzerPreset
 
 
 class VideoAnalyzerPreset(AudioAnalyzerPreset):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/video_layer_py3.py b/azure-mgmt-media/azure/mgmt/media/models/video_layer_py3.py
index 747a5c306987..e11e718b60b1 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/video_layer_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/video_layer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .layer import Layer
+from .layer_py3 import Layer
 
 
 class VideoLayer(Layer):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/video_overlay_py3.py b/azure-mgmt-media/azure/mgmt/media/models/video_overlay_py3.py
index d1216a2381ee..80158981e6dd 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/video_overlay_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/video_overlay_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .overlay import Overlay
+from .overlay_py3 import Overlay
 
 
 class VideoOverlay(Overlay):
diff --git a/azure-mgmt-media/azure/mgmt/media/models/video_py3.py b/azure-mgmt-media/azure/mgmt/media/models/video_py3.py
index f40f84cb5ac4..3850e970e6d0 100644
--- a/azure-mgmt-media/azure/mgmt/media/models/video_py3.py
+++ b/azure-mgmt-media/azure/mgmt/media/models/video_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class Video(Codec):
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py
index bd8d664024e3..89f5234824e4 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py
@@ -22,7 +22,7 @@ class AssetsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py
index f8b936e4bb7a..a5d2809b1093 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py
@@ -22,7 +22,7 @@ class ContentKeyPoliciesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py
index 0d84a10e1d8b..bb59c5478e1a 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py
@@ -22,7 +22,7 @@ class JobsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/live_events_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/live_events_operations.py
index 68a1fb34137d..e25ab34f493f 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/live_events_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/live_events_operations.py
@@ -24,7 +24,7 @@ class LiveEventsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/live_outputs_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/live_outputs_operations.py
index 6e269fe7706c..2dff2d2c0147 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/live_outputs_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/live_outputs_operations.py
@@ -24,7 +24,7 @@ class LiveOutputsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/locations_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/locations_operations.py
index 126f2e3ec644..00e53e9e2219 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/locations_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/locations_operations.py
@@ -22,7 +22,7 @@ class LocationsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/mediaservices_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/mediaservices_operations.py
index 4674eefa1207..254717aa692d 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/mediaservices_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/mediaservices_operations.py
@@ -22,7 +22,7 @@ class MediaservicesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/operations.py b/azure-mgmt-media/azure/mgmt/media/operations/operations.py
index 32c314e64196..fbf16f510d84 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/operations.py
@@ -22,7 +22,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/streaming_endpoints_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/streaming_endpoints_operations.py
index f3105b25ac65..97550b18c87f 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/streaming_endpoints_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/streaming_endpoints_operations.py
@@ -24,7 +24,7 @@ class StreamingEndpointsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/streaming_locators_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/streaming_locators_operations.py
index 39deadc4ec73..7c23eaafddc0 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/streaming_locators_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/streaming_locators_operations.py
@@ -22,7 +22,7 @@ class StreamingLocatorsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/streaming_policies_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/streaming_policies_operations.py
index bd23986372ea..930de467a644 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/streaming_policies_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/streaming_policies_operations.py
@@ -22,7 +22,7 @@ class StreamingPoliciesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py b/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py
index d8e9f15bb203..528edb66b958 100644
--- a/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py
+++ b/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py
@@ -22,7 +22,7 @@ class TransformsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-03-30-preview".
+    :ivar api_version: The Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-30-preview"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-media/azure/mgmt/media/version.py b/azure-mgmt-media/azure/mgmt/media/version.py
index dd95c38f3058..99dcc0aea3f2 100644
--- a/azure-mgmt-media/azure/mgmt/media/version.py
+++ b/azure-mgmt-media/azure/mgmt/media/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0rc1"
+VERSION = "1.0.0rc2"
 
diff --git a/azure-mgmt-media/build.json b/azure-mgmt-media/build.json
deleted file mode 100644
index 857492bd2060..000000000000
--- a/azure-mgmt-media/build.json
+++ /dev/null
@@ -1 +0,0 @@
-{"autorest": "1.2.2", "date": "2017-09-12T17:24:25Z", "version": ""}
\ No newline at end of file
diff --git a/azure-mgmt-media/sdk_packaging.toml b/azure-mgmt-media/sdk_packaging.toml
new file mode 100644
index 000000000000..9e39b0b507ad
--- /dev/null
+++ b/azure-mgmt-media/sdk_packaging.toml
@@ -0,0 +1,6 @@
+[packaging]
+package_name = "azure-mgmt-media"
+package_pprint_name = "Media Services"
+package_doc_id = "media-services"
+is_stable = false
+is_arm = true
diff --git a/azure-mgmt-media/setup.py b/azure-mgmt-media/setup.py
index 4272ef7c0f32..49be05b7b104 100644
--- a/azure-mgmt-media/setup.py
+++ b/azure-mgmt-media/setup.py
@@ -72,12 +72,13 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
     packages=find_packages(exclude=["tests"]),
     install_requires=[
-        'msrestazure>=0.4.27,<2.0.0',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
     ],
     cmdclass=cmdclass