diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py
index 3be1559b0294..e1ca23bdfc11 100644
--- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py
+++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py
@@ -24,7 +24,7 @@
     from .container_service_vm_diagnostics_py3 import ContainerServiceVMDiagnostics
     from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile
     from .container_service_py3 import ContainerService
-    from .compute_operation_value_py3 import ComputeOperationValue
+    from .operation_value_py3 import OperationValue
     from .managed_cluster_agent_pool_profile_py3 import ManagedClusterAgentPoolProfile
     from .container_service_network_profile_py3 import ContainerServiceNetworkProfile
     from .managed_cluster_addon_profile_py3 import ManagedClusterAddonProfile
@@ -51,7 +51,7 @@
     from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics
     from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
     from .container_service import ContainerService
-    from .compute_operation_value import ComputeOperationValue
+    from .operation_value import OperationValue
     from .managed_cluster_agent_pool_profile import ManagedClusterAgentPoolProfile
     from .container_service_network_profile import ContainerServiceNetworkProfile
     from .managed_cluster_addon_profile import ManagedClusterAddonProfile
@@ -64,7 +64,7 @@
     from .orchestrator_version_profile import OrchestratorVersionProfile
     from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult
 from .container_service_paged import ContainerServicePaged
-from .compute_operation_value_paged import ComputeOperationValuePaged
+from .operation_value_paged import OperationValuePaged
 from .managed_cluster_paged import ManagedClusterPaged
 from .container_service_client_enums import (
     ContainerServiceStorageProfileTypes,
@@ -90,7 +90,7 @@
     'ContainerServiceVMDiagnostics',
     'ContainerServiceDiagnosticsProfile',
     'ContainerService',
-    'ComputeOperationValue',
+    'OperationValue',
     'ManagedClusterAgentPoolProfile',
     'ContainerServiceNetworkProfile',
     'ManagedClusterAddonProfile',
@@ -103,7 +103,7 @@
     'OrchestratorVersionProfile',
     'OrchestratorVersionProfileListResult',
     'ContainerServicePaged',
-    'ComputeOperationValuePaged',
+    'OperationValuePaged',
     'ManagedClusterPaged',
     'ContainerServiceStorageProfileTypes',
     'ContainerServiceVMSizeTypes',
diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py
similarity index 95%
rename from azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py
rename to azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py
index 525ef3bbb69a..911f9fc80881 100644
--- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py
+++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py
@@ -12,7 +12,7 @@
 from msrest.serialization import Model
 
 
-class ComputeOperationValue(Model):
+class OperationValue(Model):
     """Describes the properties of a Compute Operation value.
 
     Variables are only populated by the server, and will be ignored when
@@ -51,7 +51,7 @@ class ComputeOperationValue(Model):
     }
 
     def __init__(self, **kwargs):
-        super(ComputeOperationValue, self).__init__(**kwargs)
+        super(OperationValue, self).__init__(**kwargs)
         self.origin = None
         self.name = None
         self.operation = None
diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py
similarity index 65%
rename from azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py
rename to azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py
index aad0effe7bc6..ac39a71819ae 100644
--- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py
+++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py
@@ -12,16 +12,16 @@
 from msrest.paging import Paged
 
 
-class ComputeOperationValuePaged(Paged):
+class OperationValuePaged(Paged):
     """
-    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.containerservice.models.ComputeOperationValue>` object
+    A paging container for iterating over a list of :class:`OperationValue <azure.mgmt.containerservice.models.OperationValue>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
+        'current_page': {'key': 'value', 'type': '[OperationValue]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)
+        super(OperationValuePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py
similarity index 95%
rename from azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py
rename to azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py
index 3c4388f312b9..55bceaa75439 100644
--- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py
+++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py
@@ -12,7 +12,7 @@
 from msrest.serialization import Model
 
 
-class ComputeOperationValue(Model):
+class OperationValue(Model):
     """Describes the properties of a Compute Operation value.
 
     Variables are only populated by the server, and will be ignored when
@@ -51,7 +51,7 @@ class ComputeOperationValue(Model):
     }
 
     def __init__(self, **kwargs) -> None:
-        super(ComputeOperationValue, self).__init__(**kwargs)
+        super(OperationValue, self).__init__(**kwargs)
         self.origin = None
         self.name = None
         self.operation = None
diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py
index 4da1377673bd..83337ae0311b 100644
--- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py
+++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py
@@ -46,9 +46,9 @@ def list(
          deserialized response
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of ComputeOperationValue
+        :return: An iterator like instance of OperationValue
         :rtype:
-         ~azure.mgmt.containerservice.models.ComputeOperationValuePaged[~azure.mgmt.containerservice.models.ComputeOperationValue]
+         ~azure.mgmt.containerservice.models.OperationValuePaged[~azure.mgmt.containerservice.models.OperationValue]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         def internal_paging(next_link=None, raw=False):
@@ -88,11 +88,11 @@ def internal_paging(next_link=None, raw=False):
             return response
 
         # Deserialize response
-        deserialized = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies)
+        deserialized = models.OperationValuePaged(internal_paging, self._deserialize.dependencies)
 
         if raw:
             header_dict = {}
-            client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            client_raw_response = models.OperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
             return client_raw_response
 
         return deserialized