diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/__init__.py
index 46ede884dc73..9ba14ee8d728 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/__init__.py
@@ -6,8 +6,8 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2 import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2
-__all__ = ['AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2']
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2 import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2
+__all__ = ['MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2']
 
 try:
     from ._patch import patch_sdk  # type: ignore
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_configuration.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_configuration.py
index 6c24bcccca2b..482bc4973fe9 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_configuration.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_configuration.py
@@ -19,8 +19,8 @@
 
 VERSION = "unknown"
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration(Configuration):
-    """Configuration for AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2.
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration(Configuration):
+    """Configuration for MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
@@ -42,7 +42,7 @@ def __init__(
             raise ValueError("Parameter 'credential' must not be None.")
         if endpoint is None:
             raise ValueError("Parameter 'endpoint' must not be None.")
-        super(AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration, self).__init__(**kwargs)
+        super(MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration, self).__init__(**kwargs)
 
         self.credential = credential
         self.endpoint = endpoint
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
similarity index 84%
rename from sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py
rename to sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
index b4b36a68522a..564113cfdead 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
@@ -18,13 +18,13 @@
     from azure.core.credentials import TokenCredential
     from azure.core.pipeline.transport import HttpRequest, HttpResponse
 
-from ._configuration import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration
-from .operations import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
+from ._configuration import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration
+from .operations import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
 from . import models
 
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2(AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin):
-    """Azure Cognitive Service Metrics Advisor REST API (OpenAPI v2).
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2(MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin):
+    """Microsoft Azure Metrics Advisor REST API (OpenAPI v2).
 
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials.TokenCredential
@@ -40,7 +40,7 @@ def __init__(
     ):
         # type: (...) -> None
         base_url = '{endpoint}/metricsadvisor/v1.0'
-        self._config = AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration(credential, endpoint, **kwargs)
+        self._config = MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration(credential, endpoint, **kwargs)
         self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
@@ -72,7 +72,7 @@ def close(self):
         self._client.close()
 
     def __enter__(self):
-        # type: () -> AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2
+        # type: () -> MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2
         self._client.__enter__()
         return self
 
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/__init__.py
index 3ee9a022c9b1..5110d588a403 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/__init__.py
@@ -6,5 +6,5 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2 import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2
-__all__ = ['AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2']
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2 import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2
+__all__ = ['MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2']
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_configuration.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_configuration.py
index e362d4f1a70f..f3d8f5c3fe54 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_configuration.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_configuration.py
@@ -17,8 +17,8 @@
 
 VERSION = "unknown"
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration(Configuration):
-    """Configuration for AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2.
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration(Configuration):
+    """Configuration for MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
@@ -39,7 +39,7 @@ def __init__(
             raise ValueError("Parameter 'credential' must not be None.")
         if endpoint is None:
             raise ValueError("Parameter 'endpoint' must not be None.")
-        super(AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration, self).__init__(**kwargs)
+        super(MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration, self).__init__(**kwargs)
 
         self.credential = credential
         self.endpoint = endpoint
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
similarity index 83%
rename from sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py
rename to sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
index d9f974f8bd8f..64c6f317b1f7 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2.py
@@ -16,13 +16,13 @@
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
-from ._configuration import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration
-from .operations import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
+from ._configuration import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration
+from .operations import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
 from .. import models
 
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2(AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin):
-    """Azure Cognitive Service Metrics Advisor REST API (OpenAPI v2).
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2(MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin):
+    """Microsoft Azure Metrics Advisor REST API (OpenAPI v2).
 
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
@@ -37,7 +37,7 @@ def __init__(
         **kwargs: Any
     ) -> None:
         base_url = '{endpoint}/metricsadvisor/v1.0'
-        self._config = AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2Configuration(credential, endpoint, **kwargs)
+        self._config = MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2Configuration(credential, endpoint, **kwargs)
         self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
@@ -66,7 +66,7 @@ async def _send_request(self, http_request: HttpRequest, **kwargs: Any) -> Async
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2":
+    async def __aenter__(self) -> "MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2":
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/__init__.py
index cbb0e496d2f9..d301f3c2c9f8 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/__init__.py
@@ -6,8 +6,8 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
 
 __all__ = [
-    'AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin',
+    'MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin',
 ]
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
similarity index 99%
rename from sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py
rename to sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
index 07a50f8404bd..62c6c834d229 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/aio/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
@@ -18,7 +18,7 @@
 T = TypeVar('T')
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin:
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin:
 
     async def get_active_series_count(
         self,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/__init__.py
index 56796634470c..4f426ed14666 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/__init__.py
@@ -323,7 +323,7 @@
     from ._models import WholeMetricConfiguration  # type: ignore
     from ._models import WholeMetricConfigurationPatch  # type: ignore
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums import (
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums import (
     AnomalyAlertingConfigurationLogicType,
     AnomalyDetectionConfigurationLogicType,
     AnomalyDetectorDirection,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums.py
similarity index 99%
rename from sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums.py
rename to sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums.py
index 676debb89280..58cecaa82e6a 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums.py
@@ -170,7 +170,6 @@ class Granularity(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
     DAILY = "Daily"
     HOURLY = "Hourly"
     MINUTELY = "Minutely"
-    SECONDLY = "Secondly"
     CUSTOM = "Custom"
 
 class HookType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models.py
index 7b6337ab7c4c..6acc1cb54430 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models.py
@@ -821,7 +821,7 @@ class DataFeedDetail(msrest.serialization.Model):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -995,7 +995,7 @@ class AzureApplicationInsightsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -1450,7 +1450,7 @@ class AzureBlobDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -1765,7 +1765,7 @@ class AzureCosmosDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2089,7 +2089,7 @@ class AzureDataExplorerDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2343,7 +2343,7 @@ class AzureDataLakeStorageGen2DataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2676,7 +2676,7 @@ class AzureEventHubsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2982,7 +2982,7 @@ class AzureLogAnalyticsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -3478,16 +3478,10 @@ def __init__(
 class AzureSQLConnectionStringParam(msrest.serialization.Model):
     """AzureSQLConnectionStringParam.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param connection_string: Required. The connection string to access the Azure SQL.
+    :param connection_string: The connection string to access the Azure SQL.
     :type connection_string: str
     """
 
-    _validation = {
-        'connection_string': {'required': True},
-    }
-
     _attribute_map = {
         'connection_string': {'key': 'connectionString', 'type': 'str'},
     }
@@ -3497,7 +3491,7 @@ def __init__(
         **kwargs
     ):
         super(AzureSQLConnectionStringParam, self).__init__(**kwargs)
-        self.connection_string = kwargs['connection_string']
+        self.connection_string = kwargs.get('connection_string', None)
 
 
 class AzureSQLConnectionStringParamPatch(msrest.serialization.Model):
@@ -3538,7 +3532,7 @@ class AzureTableDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -4250,16 +4244,10 @@ def __init__(
 class DataLakeGen2SharedKeyParam(msrest.serialization.Model):
     """DataLakeGen2SharedKeyParam.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param account_key: Required. The account key to access the Azure Data Lake Storage Gen2.
+    :param account_key: The account key to access the Azure Data Lake Storage Gen2.
     :type account_key: str
     """
 
-    _validation = {
-        'account_key': {'required': True},
-    }
-
     _attribute_map = {
         'account_key': {'key': 'accountKey', 'type': 'str'},
     }
@@ -4269,7 +4257,7 @@ def __init__(
         **kwargs
     ):
         super(DataLakeGen2SharedKeyParam, self).__init__(**kwargs)
-        self.account_key = kwargs['account_key']
+        self.account_key = kwargs.get('account_key', None)
 
 
 class DataLakeGen2SharedKeyParamPatch(msrest.serialization.Model):
@@ -4598,15 +4586,15 @@ class HookInfo(msrest.serialization.Model):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     """
 
     _validation = {
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -4632,7 +4620,7 @@ def __init__(
         self.hook_name = kwargs['hook_name']
         self.description = kwargs.get('description', "")
         self.external_link = kwargs.get('external_link', "")
-        self.admins = None
+        self.admins = kwargs.get('admins', None)
 
 
 class EmailHookInfo(HookInfo):
@@ -4653,8 +4641,8 @@ class EmailHookInfo(HookInfo):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter: Required.
     :type hook_parameter: ~azure.ai.metricsadvisor.models.EmailHookParameter
     """
@@ -4663,7 +4651,7 @@ class EmailHookInfo(HookInfo):
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
         'hook_parameter': {'required': True},
     }
 
@@ -4692,8 +4680,6 @@ class HookInfoPatch(msrest.serialization.Model):
     You probably want to use the sub-classes and not this class directly. Known
     sub-classes are: EmailHookInfoPatch, WebhookHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -4705,13 +4691,13 @@ class HookInfoPatch(msrest.serialization.Model):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -4735,14 +4721,12 @@ def __init__(
         self.hook_name = kwargs.get('hook_name', None)
         self.description = kwargs.get('description', None)
         self.external_link = kwargs.get('external_link', None)
-        self.admins = None
+        self.admins = kwargs.get('admins', None)
 
 
 class EmailHookInfoPatch(HookInfoPatch):
     """EmailHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -4754,15 +4738,15 @@ class EmailHookInfoPatch(HookInfoPatch):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter:
     :type hook_parameter: ~azure.ai.metricsadvisor.models.EmailHookParameterPatch
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -5249,7 +5233,7 @@ class InfluxDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -6123,7 +6107,7 @@ class MongoDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -6437,7 +6421,7 @@ class MySqlDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -6776,7 +6760,7 @@ class PostgreSqlDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -7410,7 +7394,7 @@ class ServicePrincipalInKVParam(msrest.serialization.Model):
     :type key_vault_endpoint: str
     :param key_vault_client_id: Required. The Client Id to access the Key Vault.
     :type key_vault_client_id: str
-    :param key_vault_client_secret: Required. The Client Secret to access the Key Vault.
+    :param key_vault_client_secret: The Client Secret to access the Key Vault.
     :type key_vault_client_secret: str
     :param service_principal_id_name_in_kv: Required. The secret name of the service principal's
      client Id in the Key Vault.
@@ -7425,7 +7409,6 @@ class ServicePrincipalInKVParam(msrest.serialization.Model):
     _validation = {
         'key_vault_endpoint': {'required': True},
         'key_vault_client_id': {'required': True},
-        'key_vault_client_secret': {'required': True},
         'service_principal_id_name_in_kv': {'required': True},
         'service_principal_secret_name_in_kv': {'required': True},
         'tenant_id': {'required': True},
@@ -7447,7 +7430,7 @@ def __init__(
         super(ServicePrincipalInKVParam, self).__init__(**kwargs)
         self.key_vault_endpoint = kwargs['key_vault_endpoint']
         self.key_vault_client_id = kwargs['key_vault_client_id']
-        self.key_vault_client_secret = kwargs['key_vault_client_secret']
+        self.key_vault_client_secret = kwargs.get('key_vault_client_secret', None)
         self.service_principal_id_name_in_kv = kwargs['service_principal_id_name_in_kv']
         self.service_principal_secret_name_in_kv = kwargs['service_principal_secret_name_in_kv']
         self.tenant_id = kwargs['tenant_id']
@@ -7501,7 +7484,7 @@ class ServicePrincipalParam(msrest.serialization.Model):
 
     :param client_id: Required. The client id of the service principal.
     :type client_id: str
-    :param client_secret: Required. The client secret of the service principal.
+    :param client_secret: The client secret of the service principal.
     :type client_secret: str
     :param tenant_id: Required. The tenant id of the service principal.
     :type tenant_id: str
@@ -7509,7 +7492,6 @@ class ServicePrincipalParam(msrest.serialization.Model):
 
     _validation = {
         'client_id': {'required': True},
-        'client_secret': {'required': True},
         'tenant_id': {'required': True},
     }
 
@@ -7525,7 +7507,7 @@ def __init__(
     ):
         super(ServicePrincipalParam, self).__init__(**kwargs)
         self.client_id = kwargs['client_id']
-        self.client_secret = kwargs['client_secret']
+        self.client_secret = kwargs.get('client_secret', None)
         self.tenant_id = kwargs['tenant_id']
 
 
@@ -7703,7 +7685,7 @@ class SQLServerDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -8197,8 +8179,8 @@ class WebhookHookInfo(HookInfo):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter: Required.
     :type hook_parameter: ~azure.ai.metricsadvisor.models.WebhookHookParameter
     """
@@ -8207,7 +8189,7 @@ class WebhookHookInfo(HookInfo):
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
         'hook_parameter': {'required': True},
     }
 
@@ -8233,8 +8215,6 @@ def __init__(
 class WebhookHookInfoPatch(HookInfoPatch):
     """WebhookHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -8246,15 +8226,15 @@ class WebhookHookInfoPatch(HookInfoPatch):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter:
     :type hook_parameter: ~azure.ai.metricsadvisor.models.WebhookHookParameterPatch
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -8278,8 +8258,10 @@ def __init__(
 class WebhookHookParameter(msrest.serialization.Model):
     """WebhookHookParameter.
 
-    :param endpoint: API address, will be called when alert is triggered, only support POST method
-     via SSL.
+    All required parameters must be populated in order to send to Azure.
+
+    :param endpoint: Required. API address, will be called when alert is triggered, only support
+     POST method via SSL.
     :type endpoint: str
     :param username: (Deprecated) The username, if using basic authentication.
     :type username: str
@@ -8295,6 +8277,10 @@ class WebhookHookParameter(msrest.serialization.Model):
     :type certificate_password: str
     """
 
+    _validation = {
+        'endpoint': {'required': True},
+    }
+
     _attribute_map = {
         'endpoint': {'key': 'endpoint', 'type': 'str'},
         'username': {'key': 'username', 'type': 'str'},
@@ -8309,7 +8295,7 @@ def __init__(
         **kwargs
     ):
         super(WebhookHookParameter, self).__init__(**kwargs)
-        self.endpoint = kwargs.get('endpoint', None)
+        self.endpoint = kwargs['endpoint']
         self.username = kwargs.get('username', None)
         self.password = kwargs.get('password', None)
         self.headers = kwargs.get('headers', None)
@@ -8320,10 +8306,8 @@ def __init__(
 class WebhookHookParameterPatch(msrest.serialization.Model):
     """WebhookHookParameterPatch.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param endpoint: Required. API address, will be called when alert is triggered, only support
-     POST method via SSL.
+    :param endpoint: API address, will be called when alert is triggered, only support POST method
+     via SSL.
     :type endpoint: str
     :param username: (Deprecated) The username, if using basic authentication.
     :type username: str
@@ -8337,10 +8321,6 @@ class WebhookHookParameterPatch(msrest.serialization.Model):
     :type certificate_password: str
     """
 
-    _validation = {
-        'endpoint': {'required': True},
-    }
-
     _attribute_map = {
         'endpoint': {'key': 'endpoint', 'type': 'str'},
         'username': {'key': 'username', 'type': 'str'},
@@ -8355,7 +8335,7 @@ def __init__(
         **kwargs
     ):
         super(WebhookHookParameterPatch, self).__init__(**kwargs)
-        self.endpoint = kwargs['endpoint']
+        self.endpoint = kwargs.get('endpoint', None)
         self.username = kwargs.get('username', None)
         self.password = kwargs.get('password', None)
         self.headers = kwargs.get('headers', None)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models_py3.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models_py3.py
index d60bd4f4bbcc..621077cd6989 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models_py3.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/models/_models_py3.py
@@ -12,7 +12,7 @@
 from azure.core.exceptions import HttpResponseError
 import msrest.serialization
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums import *
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums import *
 
 
 class AlertingResultQuery(msrest.serialization.Model):
@@ -891,7 +891,7 @@ class DataFeedDetail(msrest.serialization.Model):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -1090,7 +1090,7 @@ class AzureApplicationInsightsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -1626,7 +1626,7 @@ class AzureBlobDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -1998,7 +1998,7 @@ class AzureCosmosDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2381,7 +2381,7 @@ class AzureDataExplorerDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -2684,7 +2684,7 @@ class AzureDataLakeStorageGen2DataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -3078,7 +3078,7 @@ class AzureEventHubsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -3439,7 +3439,7 @@ class AzureLogAnalyticsDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -4010,16 +4010,10 @@ def __init__(
 class AzureSQLConnectionStringParam(msrest.serialization.Model):
     """AzureSQLConnectionStringParam.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param connection_string: Required. The connection string to access the Azure SQL.
+    :param connection_string: The connection string to access the Azure SQL.
     :type connection_string: str
     """
 
-    _validation = {
-        'connection_string': {'required': True},
-    }
-
     _attribute_map = {
         'connection_string': {'key': 'connectionString', 'type': 'str'},
     }
@@ -4027,7 +4021,7 @@ class AzureSQLConnectionStringParam(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        connection_string: str,
+        connection_string: Optional[str] = None,
         **kwargs
     ):
         super(AzureSQLConnectionStringParam, self).__init__(**kwargs)
@@ -4074,7 +4068,7 @@ class AzureTableDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -4879,16 +4873,10 @@ def __init__(
 class DataLakeGen2SharedKeyParam(msrest.serialization.Model):
     """DataLakeGen2SharedKeyParam.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param account_key: Required. The account key to access the Azure Data Lake Storage Gen2.
+    :param account_key: The account key to access the Azure Data Lake Storage Gen2.
     :type account_key: str
     """
 
-    _validation = {
-        'account_key': {'required': True},
-    }
-
     _attribute_map = {
         'account_key': {'key': 'accountKey', 'type': 'str'},
     }
@@ -4896,7 +4884,7 @@ class DataLakeGen2SharedKeyParam(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        account_key: str,
+        account_key: Optional[str] = None,
         **kwargs
     ):
         super(DataLakeGen2SharedKeyParam, self).__init__(**kwargs)
@@ -5259,15 +5247,15 @@ class HookInfo(msrest.serialization.Model):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     """
 
     _validation = {
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -5289,6 +5277,7 @@ def __init__(
         hook_name: str,
         description: Optional[str] = "",
         external_link: Optional[str] = "",
+        admins: Optional[List[str]] = None,
         **kwargs
     ):
         super(HookInfo, self).__init__(**kwargs)
@@ -5297,7 +5286,7 @@ def __init__(
         self.hook_name = hook_name
         self.description = description
         self.external_link = external_link
-        self.admins = None
+        self.admins = admins
 
 
 class EmailHookInfo(HookInfo):
@@ -5318,8 +5307,8 @@ class EmailHookInfo(HookInfo):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter: Required.
     :type hook_parameter: ~azure.ai.metricsadvisor.models.EmailHookParameter
     """
@@ -5328,7 +5317,7 @@ class EmailHookInfo(HookInfo):
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
         'hook_parameter': {'required': True},
     }
 
@@ -5349,9 +5338,10 @@ def __init__(
         hook_parameter: "EmailHookParameter",
         description: Optional[str] = "",
         external_link: Optional[str] = "",
+        admins: Optional[List[str]] = None,
         **kwargs
     ):
-        super(EmailHookInfo, self).__init__(hook_name=hook_name, description=description, external_link=external_link, **kwargs)
+        super(EmailHookInfo, self).__init__(hook_name=hook_name, description=description, external_link=external_link, admins=admins, **kwargs)
         self.hook_type = 'Email'  # type: str
         self.hook_parameter = hook_parameter
 
@@ -5362,8 +5352,6 @@ class HookInfoPatch(msrest.serialization.Model):
     You probably want to use the sub-classes and not this class directly. Known
     sub-classes are: EmailHookInfoPatch, WebhookHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -5375,13 +5363,13 @@ class HookInfoPatch(msrest.serialization.Model):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -5402,6 +5390,7 @@ def __init__(
         hook_name: Optional[str] = None,
         description: Optional[str] = None,
         external_link: Optional[str] = None,
+        admins: Optional[List[str]] = None,
         **kwargs
     ):
         super(HookInfoPatch, self).__init__(**kwargs)
@@ -5409,14 +5398,12 @@ def __init__(
         self.hook_name = hook_name
         self.description = description
         self.external_link = external_link
-        self.admins = None
+        self.admins = admins
 
 
 class EmailHookInfoPatch(HookInfoPatch):
     """EmailHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -5428,15 +5415,15 @@ class EmailHookInfoPatch(HookInfoPatch):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter:
     :type hook_parameter: ~azure.ai.metricsadvisor.models.EmailHookParameterPatch
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -5454,10 +5441,11 @@ def __init__(
         hook_name: Optional[str] = None,
         description: Optional[str] = None,
         external_link: Optional[str] = None,
+        admins: Optional[List[str]] = None,
         hook_parameter: Optional["EmailHookParameterPatch"] = None,
         **kwargs
     ):
-        super(EmailHookInfoPatch, self).__init__(hook_name=hook_name, description=description, external_link=external_link, **kwargs)
+        super(EmailHookInfoPatch, self).__init__(hook_name=hook_name, description=description, external_link=external_link, admins=admins, **kwargs)
         self.hook_type = 'Email'  # type: str
         self.hook_parameter = hook_parameter
 
@@ -5960,7 +5948,7 @@ class InfluxDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -6933,7 +6921,7 @@ class MongoDBDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -7304,7 +7292,7 @@ class MySqlDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -7699,7 +7687,7 @@ class PostgreSqlDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -8424,7 +8412,7 @@ class ServicePrincipalInKVParam(msrest.serialization.Model):
     :type key_vault_endpoint: str
     :param key_vault_client_id: Required. The Client Id to access the Key Vault.
     :type key_vault_client_id: str
-    :param key_vault_client_secret: Required. The Client Secret to access the Key Vault.
+    :param key_vault_client_secret: The Client Secret to access the Key Vault.
     :type key_vault_client_secret: str
     :param service_principal_id_name_in_kv: Required. The secret name of the service principal's
      client Id in the Key Vault.
@@ -8439,7 +8427,6 @@ class ServicePrincipalInKVParam(msrest.serialization.Model):
     _validation = {
         'key_vault_endpoint': {'required': True},
         'key_vault_client_id': {'required': True},
-        'key_vault_client_secret': {'required': True},
         'service_principal_id_name_in_kv': {'required': True},
         'service_principal_secret_name_in_kv': {'required': True},
         'tenant_id': {'required': True},
@@ -8459,10 +8446,10 @@ def __init__(
         *,
         key_vault_endpoint: str,
         key_vault_client_id: str,
-        key_vault_client_secret: str,
         service_principal_id_name_in_kv: str,
         service_principal_secret_name_in_kv: str,
         tenant_id: str,
+        key_vault_client_secret: Optional[str] = None,
         **kwargs
     ):
         super(ServicePrincipalInKVParam, self).__init__(**kwargs)
@@ -8529,7 +8516,7 @@ class ServicePrincipalParam(msrest.serialization.Model):
 
     :param client_id: Required. The client id of the service principal.
     :type client_id: str
-    :param client_secret: Required. The client secret of the service principal.
+    :param client_secret: The client secret of the service principal.
     :type client_secret: str
     :param tenant_id: Required. The tenant id of the service principal.
     :type tenant_id: str
@@ -8537,7 +8524,6 @@ class ServicePrincipalParam(msrest.serialization.Model):
 
     _validation = {
         'client_id': {'required': True},
-        'client_secret': {'required': True},
         'tenant_id': {'required': True},
     }
 
@@ -8551,8 +8537,8 @@ def __init__(
         self,
         *,
         client_id: str,
-        client_secret: str,
         tenant_id: str,
+        client_secret: Optional[str] = None,
         **kwargs
     ):
         super(ServicePrincipalParam, self).__init__(**kwargs)
@@ -8753,7 +8739,7 @@ class SQLServerDataFeed(DataFeedDetail):
     :param data_feed_description: data feed description.
     :type data_feed_description: str
     :param granularity_name: Required. granularity of the time series. Possible values include:
-     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Secondly", "Custom".
+     "Yearly", "Monthly", "Weekly", "Daily", "Hourly", "Minutely", "Custom".
     :type granularity_name: str or ~azure.ai.metricsadvisor.models.Granularity
     :param granularity_amount: if granularity is custom,it is required.
     :type granularity_amount: int
@@ -9319,8 +9305,8 @@ class WebhookHookInfo(HookInfo):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter: Required.
     :type hook_parameter: ~azure.ai.metricsadvisor.models.WebhookHookParameter
     """
@@ -9329,7 +9315,7 @@ class WebhookHookInfo(HookInfo):
         'hook_type': {'required': True},
         'hook_id': {'readonly': True},
         'hook_name': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
         'hook_parameter': {'required': True},
     }
 
@@ -9350,9 +9336,10 @@ def __init__(
         hook_parameter: "WebhookHookParameter",
         description: Optional[str] = "",
         external_link: Optional[str] = "",
+        admins: Optional[List[str]] = None,
         **kwargs
     ):
-        super(WebhookHookInfo, self).__init__(hook_name=hook_name, description=description, external_link=external_link, **kwargs)
+        super(WebhookHookInfo, self).__init__(hook_name=hook_name, description=description, external_link=external_link, admins=admins, **kwargs)
         self.hook_type = 'Webhook'  # type: str
         self.hook_parameter = hook_parameter
 
@@ -9360,8 +9347,6 @@ def __init__(
 class WebhookHookInfoPatch(HookInfoPatch):
     """WebhookHookInfoPatch.
 
-    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 hook_type: Required. hook type.Constant filled by server.  Possible values include:
@@ -9373,15 +9358,15 @@ class WebhookHookInfoPatch(HookInfoPatch):
     :type description: str
     :param external_link: hook external link.
     :type external_link: str
-    :ivar admins: hook administrators.
-    :vartype admins: list[str]
+    :param admins: hook administrators.
+    :type admins: list[str]
     :param hook_parameter:
     :type hook_parameter: ~azure.ai.metricsadvisor.models.WebhookHookParameterPatch
     """
 
     _validation = {
         'hook_type': {'required': True},
-        'admins': {'readonly': True, 'unique': True},
+        'admins': {'unique': True},
     }
 
     _attribute_map = {
@@ -9399,10 +9384,11 @@ def __init__(
         hook_name: Optional[str] = None,
         description: Optional[str] = None,
         external_link: Optional[str] = None,
+        admins: Optional[List[str]] = None,
         hook_parameter: Optional["WebhookHookParameterPatch"] = None,
         **kwargs
     ):
-        super(WebhookHookInfoPatch, self).__init__(hook_name=hook_name, description=description, external_link=external_link, **kwargs)
+        super(WebhookHookInfoPatch, self).__init__(hook_name=hook_name, description=description, external_link=external_link, admins=admins, **kwargs)
         self.hook_type = 'Webhook'  # type: str
         self.hook_parameter = hook_parameter
 
@@ -9410,8 +9396,10 @@ def __init__(
 class WebhookHookParameter(msrest.serialization.Model):
     """WebhookHookParameter.
 
-    :param endpoint: API address, will be called when alert is triggered, only support POST method
-     via SSL.
+    All required parameters must be populated in order to send to Azure.
+
+    :param endpoint: Required. API address, will be called when alert is triggered, only support
+     POST method via SSL.
     :type endpoint: str
     :param username: (Deprecated) The username, if using basic authentication.
     :type username: str
@@ -9427,6 +9415,10 @@ class WebhookHookParameter(msrest.serialization.Model):
     :type certificate_password: str
     """
 
+    _validation = {
+        'endpoint': {'required': True},
+    }
+
     _attribute_map = {
         'endpoint': {'key': 'endpoint', 'type': 'str'},
         'username': {'key': 'username', 'type': 'str'},
@@ -9439,7 +9431,7 @@ class WebhookHookParameter(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        endpoint: Optional[str] = None,
+        endpoint: str,
         username: Optional[str] = None,
         password: Optional[str] = None,
         headers: Optional[Dict[str, str]] = None,
@@ -9459,10 +9451,8 @@ def __init__(
 class WebhookHookParameterPatch(msrest.serialization.Model):
     """WebhookHookParameterPatch.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param endpoint: Required. API address, will be called when alert is triggered, only support
-     POST method via SSL.
+    :param endpoint: API address, will be called when alert is triggered, only support POST method
+     via SSL.
     :type endpoint: str
     :param username: (Deprecated) The username, if using basic authentication.
     :type username: str
@@ -9476,10 +9466,6 @@ class WebhookHookParameterPatch(msrest.serialization.Model):
     :type certificate_password: str
     """
 
-    _validation = {
-        'endpoint': {'required': True},
-    }
-
     _attribute_map = {
         'endpoint': {'key': 'endpoint', 'type': 'str'},
         'username': {'key': 'username', 'type': 'str'},
@@ -9492,7 +9478,7 @@ class WebhookHookParameterPatch(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        endpoint: str,
+        endpoint: Optional[str] = None,
         username: Optional[str] = None,
         password: Optional[str] = None,
         headers: Optional[Dict[str, str]] = None,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/__init__.py
index cbb0e496d2f9..d301f3c2c9f8 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/__init__.py
@@ -6,8 +6,8 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
+from ._microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin
 
 __all__ = [
-    'AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin',
+    'MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin',
 ]
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
similarity index 99%
rename from sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py
rename to sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
index aa358f18a6e4..73b02ed9e7b0 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_operations.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_generated/operations/_microsoft_azure_metrics_advisor_restapi_open_ap_iv2_operations.py
@@ -22,7 +22,7 @@
     T = TypeVar('T')
     ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
-class AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin(object):
+class MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2OperationsMixin(object):
 
     def get_active_series_count(
         self,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
index 88cd58c539c5..2b1111e19bc8 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
@@ -17,8 +17,8 @@
 import datetime
 import six
 from azure.core.tracing.decorator import distributed_trace
-from ._generated._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2 \
-    import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2 as _Client
+from ._generated._microsoft_azure_metrics_advisor_restapi_open_ap_iv2 \
+    import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2 as _Client
 from ._generated.models import (
     AnomalyAlertingConfiguration as _AnomalyAlertingConfiguration,
     AzureApplicationInsightsDataFeed as _AzureApplicationInsightsDataFeed,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_client.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_client.py
index b72d734ded2c..12fc65b10c8f 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_client.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_client.py
@@ -23,7 +23,7 @@
     SeriesIdentity,
     FeedbackDimensionFilter,
 )
-from ._generated import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2 as _Client
+from ._generated import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2 as _Client
 from ._helpers import convert_to_sub_feedback, convert_datetime, get_authentication_policy
 from .models._models import (
     AnomalyIncident,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
index 863398b5e38c..c90ac9502a2a 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
@@ -19,7 +19,7 @@
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.async_paging import AsyncItemPaged
-from .._generated.aio import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2 as _ClientAsync
+from .._generated.aio import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2 as _ClientAsync
 from .._generated.models import (
     AnomalyAlertingConfiguration as _AnomalyAlertingConfiguration,
     AnomalyDetectionConfiguration as _AnomalyDetectionConfiguration,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_client_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_client_async.py
index d7cbe98612ac..48d005195fc2 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_client_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_client_async.py
@@ -27,7 +27,7 @@
     SeriesIdentity,
     FeedbackDimensionFilter,
 )
-from .._generated.aio import AzureCognitiveServiceMetricsAdvisorRESTAPIOpenAPIV2 as _ClientAsync
+from .._generated.aio import MicrosoftAzureMetricsAdvisorRESTAPIOpenAPIV2 as _ClientAsync
 from .._helpers import convert_to_sub_feedback, convert_datetime, get_authentication_policy
 from ..models._models import (
     AnomalyIncident,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
index 240a5e4e8661..2de01c394da6 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
@@ -24,7 +24,7 @@
 #
 # --------------------------------------------------------------------------
 
-from .._generated.models._azure_cognitive_service_metrics_advisor_restapi_open_ap_iv2_enums import (
+from .._generated.models._microsoft_azure_metrics_advisor_restapi_open_ap_iv2_enums import (
     SnoozeScope,
     Severity as AnomalySeverity,
     DataSourceType,