diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
index 3f2e351e60d..44ed25fdfa9 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .api_entity_base_contract import ApiEntityBaseContract
+from .api_entity_base_contract_py3 import ApiEntityBaseContract
 
 
 class ApiContractProperties(ApiEntityBaseContract):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
index 6bce137bf55..bc322521771 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
index d7c3b940a61..cc53a960595 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .apim_resource import ApimResource
+from .apim_resource_py3 import ApimResource
 
 
 class ApiManagementServiceResource(ApimResource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
index 611acfe79b5..60f3f6b21a2 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .apim_resource import ApimResource
+from .apim_resource_py3 import ApimResource
 
 
 class ApiManagementServiceUpdateParameters(ApimResource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
index 505fddf8ca6..445e2e9ea5c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiReleaseContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
index 89fc914e2ed..3673089c3be 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .api_entity_base_contract import ApiEntityBaseContract
+from .api_entity_base_contract_py3 import ApiEntityBaseContract
 
 
 class ApiTagResourceContractProperties(ApiEntityBaseContract):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
index 53e5e813b7d..151e5bec6bf 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiVersionSetContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
index 12f0102bb0f..a8ccc68ee9c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AuthorizationServerContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
index 48cf98d0c3a..d6b6e235700 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AuthorizationServerUpdateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
index 03492726045..bb2138c77a9 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class BackendContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
index f871cad6948..315aae1f428 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class BackendReconnectContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
index 86efedbe9e6..46410017941 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class CertificateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
index d99b08f4753..4b1236737bc 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class DiagnosticContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
index 19a2117a761..3d3fcd21758 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class EmailTemplateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
index 039c9aa4cb2..cd6591f007d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error Body contract.
+    """Error Response.
 
     :param code: Service-defined error code. This code serves as a sub-status
      for the HTTP error code specified in the response.
@@ -27,9 +27,9 @@ class ErrorResponse(Model):
     """
 
     _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+        'code': {'key': 'error.code', 'type': 'str'},
+        'message': {'key': 'error.message', 'type': 'str'},
+        'details': {'key': 'error.details', 'type': '[ErrorFieldContract]'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
index 1fa961c53dc..682261f414e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error Body contract.
+    """Error Response.
 
     :param code: Service-defined error code. This code serves as a sub-status
      for the HTTP error code specified in the response.
@@ -27,9 +27,9 @@ class ErrorResponse(Model):
     """
 
     _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+        'code': {'key': 'error.code', 'type': 'str'},
+        'message': {'key': 'error.message', 'type': 'str'},
+        'details': {'key': 'error.details', 'type': '[ErrorFieldContract]'},
     }
 
     def __init__(self, *, code: str=None, message: str=None, details=None, **kwargs) -> None:
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
index ff03e70f625..89d02fafe9f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class GroupContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
index 0e98fd010e4..d96b8e34df5 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IdentityProviderContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
index 0e45bbcc429..6eda14e9e00 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueAttachmentContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
index 9c73ecc0950..06b355047a9 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueCommentContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
index a3dee3306e3..fb9605cf350 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
index 7a00a541d06..fa2b08eea13 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class LoggerContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
index 7c65700cd81..bcc72b618dd 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class NotificationContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
index b6ce0c8e930..cbbc85bde12 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class OpenidConnectProviderContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
index 3bf40436598..197b2f410f8 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class OperationContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
index 1c1842d9d2a..51b99639b6d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PolicyContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
index 37ac024765c..3aa96ae6ff5 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalDelegationSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
index 7e507a23ad3..5f7a08a5a7f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalSigninSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
index 14ed9919c00..46eb461e53f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalSignupSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
index 1eb6a68eb3c..adefb099a2e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ProductContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
index 16fbd3bf17d..d0b95a1d978 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .product_entity_base_parameters import ProductEntityBaseParameters
+from .product_entity_base_parameters_py3 import ProductEntityBaseParameters
 
 
 class ProductTagResourceContractProperties(ProductEntityBaseParameters):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
index 516b4089222..36a779b263c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PropertyContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
index 0cb59412102..175381652c0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RecipientEmailContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
index b9202491358..a3112c65a24 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RecipientUserContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
index 509f4fc9b37..552e09ef7db 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class SchemaContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
index 334da97ad5d..11147bb6494 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class SubscriptionContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
index fb91c3eb73c..175c0410c17 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TagContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
index 12d7707c2ad..4ae8bda6437 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TagDescriptionContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
index 72ac42c66f2..b1069e94e4c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class UserContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
index 45c63fb4f99..a7b76a12c39 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
@@ -146,8 +146,9 @@ def check_entity_exists(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -165,7 +166,7 @@ def check_entity_exists(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -209,8 +210,9 @@ def create_or_update(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -229,7 +231,7 @@ def create_or_update(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -280,8 +282,9 @@ def delete(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -299,7 +302,7 @@ def delete(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)