diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
deleted file mode 100644
index fbebf1a80bc09..0000000000000
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
diff --git a/dev-python/python-musicbrainzngs/Manifest b/dev-python/python-musicbrainzngs/Manifest
new file mode 100644
index 0000000000000..d822a2016c42e
--- /dev/null
+++ b/dev-python/python-musicbrainzngs/Manifest
@@ -0,0 +1 @@
+DIST python-musicbrainzngs-0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainzngs/metadata.xml
similarity index 100%
rename from dev-python/python-musicbrainz-ngs/metadata.xml
rename to dev-python/python-musicbrainzngs/metadata.xml
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
similarity index 79%
rename from dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
rename to dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
index e1cdd629ab187..e2687bd8f8c9b 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
@@ -3,16 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
-MY_PN="${PN/%-ngs/ngs}"
-
 DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
 HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="
+	https://github.com/alastair/python-musicbrainzngs/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
index 742f2c162d473..286afb9330e45 100644
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
 		dev-python/munkres[${PYTHON_USEDEP}]
 		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index c7d2d2175706a..18950a225ca1b 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
 		dev-python/munkres[${PYTHON_USEDEP}]
 		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/media-sound/whipper/whipper-0.10.0.ebuild b/media-sound/whipper/whipper-0.10.0.ebuild
index 964e6c65cd230..4ec1758f78e4b 100644
--- a/media-sound/whipper/whipper-0.10.0.ebuild
+++ b/media-sound/whipper/whipper-0.10.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/python-discid[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainzngs[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild
index c14aa57f5c22b..40427bf3a99b2 100644
--- a/media-sound/whipper/whipper-0.9.0.ebuild
+++ b/media-sound/whipper/whipper-0.9.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/libcdio-paranoia-0.94_p2
 	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainzngs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 24ae32978e96a..2c808a92c1977 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -5,3 +5,4 @@ move dev-python/cfn-python-lint dev-python/cfn-lint
 move dev-python/dbusmock dev-python/python-dbusmock
 move dev-python/fcl dev-python/python-fcl
 move dev-python/python-backoff dev-python/backoff
+move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs