diff --git a/azure-mgmt-costmanagement/MANIFEST.in b/azure-mgmt-costmanagement/MANIFEST.in
index bb37a2723dae..6ceb27f7a96e 100644
--- a/azure-mgmt-costmanagement/MANIFEST.in
+++ b/azure-mgmt-costmanagement/MANIFEST.in
@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression.py
index 476e9efcb007..f83b560bfdb6 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression.py
@@ -20,7 +20,7 @@ class ReportConfigComparisonExpression(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the column to use in comaprison.
+    :param name: Required. The name of the column to use in comparison.
     :type name: str
     :ivar operator: Required. The operator to use for comparison. Default
      value: "In" .
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression_py3.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression_py3.py
index dad044f5cbe6..efdeb11ba56d 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression_py3.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_comparison_expression_py3.py
@@ -20,7 +20,7 @@ class ReportConfigComparisonExpression(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the column to use in comaprison.
+    :param name: Required. The name of the column to use in comparison.
     :type name: str
     :ivar operator: Required. The operator to use for comparison. Default
      value: "In" .
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset.py
index 06ee725bbc9f..379de034502a 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset.py
@@ -26,11 +26,11 @@ class ReportConfigDataset(Model):
      ~azure.mgmt.costmanagement.models.ReportConfigDatasetConfiguration
     :param aggregation: Dictionary of aggregation expression to use in the
      report. The key of each item in the dictionary is the alias for the
-     aggregated column. Report can have upto 2 aggregation clauses.
+     aggregated column. Report can have up to 2 aggregation clauses.
     :type aggregation: dict[str,
      ~azure.mgmt.costmanagement.models.ReportConfigAggregation]
     :param grouping: Array of group by expression to use in the report. Report
-     can have upto 2 group by clauses.
+     can have up to 2 group by clauses.
     :type grouping:
      list[~azure.mgmt.costmanagement.models.ReportConfigGrouping]
     :param filter: Has filter expression to use in the report.
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset_py3.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset_py3.py
index 02f8eb36cb64..7ccb79537f8b 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset_py3.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_dataset_py3.py
@@ -26,11 +26,11 @@ class ReportConfigDataset(Model):
      ~azure.mgmt.costmanagement.models.ReportConfigDatasetConfiguration
     :param aggregation: Dictionary of aggregation expression to use in the
      report. The key of each item in the dictionary is the alias for the
-     aggregated column. Report can have upto 2 aggregation clauses.
+     aggregated column. Report can have up to 2 aggregation clauses.
     :type aggregation: dict[str,
      ~azure.mgmt.costmanagement.models.ReportConfigAggregation]
     :param grouping: Array of group by expression to use in the report. Report
-     can have upto 2 group by clauses.
+     can have up to 2 group by clauses.
     :type grouping:
      list[~azure.mgmt.costmanagement.models.ReportConfigGrouping]
     :param filter: Has filter expression to use in the report.
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter.py
index 28cfde2c4e62..9802f5634ccc 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter.py
@@ -15,11 +15,11 @@
 class ReportConfigFilter(Model):
     """The filter expression to be used in the report.
 
-    :param and_property: The logical "AND" expression. Must have atleast 2
+    :param and_property: The logical "AND" expression. Must have at least 2
      items.
     :type and_property:
      list[~azure.mgmt.costmanagement.models.ReportConfigFilter]
-    :param or_property: The logical "OR" expression. Must have atleast 2
+    :param or_property: The logical "OR" expression. Must have at least 2
      items.
     :type or_property:
      list[~azure.mgmt.costmanagement.models.ReportConfigFilter]
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter_py3.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter_py3.py
index 2cbd1466c50c..43521afa34eb 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter_py3.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/models/report_config_filter_py3.py
@@ -15,11 +15,11 @@
 class ReportConfigFilter(Model):
     """The filter expression to be used in the report.
 
-    :param and_property: The logical "AND" expression. Must have atleast 2
+    :param and_property: The logical "AND" expression. Must have at least 2
      items.
     :type and_property:
      list[~azure.mgmt.costmanagement.models.ReportConfigFilter]
-    :param or_property: The logical "OR" expression. Must have atleast 2
+    :param or_property: The logical "OR" expression. Must have at least 2
      items.
     :type or_property:
      list[~azure.mgmt.costmanagement.models.ReportConfigFilter]
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/billing_account_dimensions_operations.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/billing_account_dimensions_operations.py
index 46155cdb1698..4ef732e976ed 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/billing_account_dimensions_operations.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/billing_account_dimensions_operations.py
@@ -47,7 +47,7 @@ def list(
          Supported operators are 'eq','lt', 'gt', 'le', 'ge'.
         :type filter: str
         :param expand: May be used to expand the properties/data within a
-         dimension dategory. By default, data is not included when listing
+         dimension category. By default, data is not included when listing
          dimensions.
         :type expand: str
         :param skiptoken: Skiptoken is only used if a previous operation
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/resource_group_dimensions_operations.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/resource_group_dimensions_operations.py
index ed8950494a63..ed03023fd3bd 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/resource_group_dimensions_operations.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/resource_group_dimensions_operations.py
@@ -47,7 +47,7 @@ def list(
          Supported operators are 'eq','lt', 'gt', 'le', 'ge'.
         :type filter: str
         :param expand: May be used to expand the properties/data within a
-         dimension dategory. By default, data is not included when listing
+         dimension category. By default, data is not included when listing
          dimensions.
         :type expand: str
         :param skiptoken: Skiptoken is only used if a previous operation
diff --git a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/subscription_dimensions_operations.py b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/subscription_dimensions_operations.py
index a49658d4b763..6bdbde4f71ed 100644
--- a/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/subscription_dimensions_operations.py
+++ b/azure-mgmt-costmanagement/azure/mgmt/costmanagement/operations/subscription_dimensions_operations.py
@@ -45,7 +45,7 @@ def list(
          Supported operators are 'eq','lt', 'gt', 'le', 'ge'.
         :type filter: str
         :param expand: May be used to expand the properties/data within a
-         dimension dategory. By default, data is not included when listing
+         dimension category. By default, data is not included when listing
          dimensions.
         :type expand: str
         :param skiptoken: Skiptoken is only used if a previous operation