diff --git a/.gitignore b/.gitignore
index 0579211..6f15d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /azure-mgmt-batchai-2.0.0.zip
-/azure-mgmt-batchai-7.0.0b1.zip
diff --git a/python-azure-mgmt-batchai.spec b/python-azure-mgmt-batchai.spec
index a2d8388..04c12f2 100644
--- a/python-azure-mgmt-batchai.spec
+++ b/python-azure-mgmt-batchai.spec
@@ -1,18 +1,19 @@
 %global         srcname     azure-mgmt-batchai
 
 Name:           python-%{srcname}
-Version:        7.0.0b1
-Release:        1%{?dist}
+Version:        2.0.0
+Release:        3%{?dist}
 Summary:        Microsoft Azure Batch AI Management Client Library for Python
 License:        MIT
 URL:            https://pypi.org/project/%{srcname}/
 Source0:        %{pypi_source %{srcname} %{version} zip}
+Patch0:         remove-custom-wheel-generator.patch
 
 BuildArch:      noarch
 
 Obsoletes:      python-azure-sdk < 5.0.1
 
-BuildRequires:  python3-devel
+BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  pyproject-rpm-macros
 
 
@@ -22,15 +23,18 @@ Microsoft Azure Batch AI Management Client Library for Python}
 %description %{_description}
 
 
-%package -n python3-%{srcname}
+%package -n python%{python3_pkgversion}-%{srcname}
 Summary:        %{summary}
 
-%description -n python3-%{srcname} %{_description}
+%description -n python%{python3_pkgversion}-%{srcname} %{_description}
 
 
 %prep
 %autosetup -p0 -n %{srcname}-%{version}
 
+# Remove the customized wheel builder included by Microsoft that adds
+# azure-mgmt-nspkg to the requirements.
+rm -f azure_bdist_wheel.py
 
 %generate_buildrequires
 %pyproject_buildrequires -r
@@ -50,15 +54,12 @@ rm -rf %{buildroot}%{python3_sitelib}/azure/mgmt/{__init__.py,__pycache__}
 
 
 %files -n python3-%{srcname}
-%doc README.md CHANGELOG.md
+%doc README.rst HISTORY.rst
 %{python3_sitelib}/azure/mgmt/batchai
 %{python3_sitelib}/azure_mgmt_batchai-%{version}.dist-info
 
 
 %changelog
-* Thu Jul 22 2021 Major Hayden <major@mhtx.net> - 7.0.0b1-1
-- Update to 7.0.0b1
-
 * Wed Jul 14 2021 Major Hayden <major@mhtx.net> - 2.0.0-3
 - Remove unneccessary __init__.py files to avoid file conflicts.
 
diff --git a/remove-custom-wheel-generator.patch b/remove-custom-wheel-generator.patch
new file mode 100644
index 0000000..c9f62ba
--- /dev/null
+++ b/remove-custom-wheel-generator.patch
@@ -0,0 +1,20 @@
+diff -up ./MANIFEST.in.orig ./MANIFEST.in
+--- ./MANIFEST.in.orig	2021-07-07 07:41:14.763972272 -0500
++++ ./MANIFEST.in	2021-07-07 07:41:19.760937165 -0500
+@@ -1,2 +1 @@
+ include *.rst
+-include azure_bdist_wheel.py
+\ No newline at end of file
+diff -up ./setup.cfg.orig ./setup.cfg
+--- ./setup.cfg.orig	2021-07-07 07:41:08.612015494 -0500
++++ ./setup.cfg	2021-07-07 07:41:24.623903000 -0500
+@@ -1,8 +1,6 @@
+ [bdist_wheel]
+ universal = 1
+-azure-namespace-package = azure-mgmt-nspkg
+ 
+ [egg_info]
+-tag_build = 
++tag_build =
+ tag_date = 0
+-
diff --git a/sources b/sources
index 9acb8d9..fc16f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (azure-mgmt-batchai-7.0.0b1.zip) = c81be868cb87ff9d2acc82b83581844586a31ecbb8b4a3a8e2025cfcc658009030dd97ce873b6b2d0d2ab175ac4ba21ed4c1906f08f047c8c84fc4081e26be2b
+SHA512 (azure-mgmt-batchai-2.0.0.zip) = 67f16bb454ef9ca009e81788d68782dfd65ff62d31ddb6708e9e3c07ceb60a199cf1d4f4917bd9f37c1d9d7bf14f1746fbe8e566ccc0d567f99fb5dbcf9d1aa4