diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-core/Manifest
similarity index 100%
rename from app-admin/ansible-base/Manifest
rename to app-admin/ansible-core/Manifest
diff --git a/app-admin/ansible-base/ansible-base-2.11.7.ebuild b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.11.7.ebuild
rename to app-admin/ansible-core/ansible-core-2.11.7.ebuild
index 3b6b3c0d41e65..e84226ab4437d 100644
--- a/app-admin/ansible-base/ansible-base-2.11.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.7.ebuild b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.12.7.ebuild
rename to app-admin/ansible-core/ansible-core-2.12.7.ebuild
index e8c2a3cb1c456..aebbfcec8b523 100644
--- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.12.8.ebuild b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.12.8.ebuild
rename to app-admin/ansible-core/ansible-core-2.12.8.ebuild
index 06d9ba54c0273..10e608c937a91 100644
--- a/app-admin/ansible-base/ansible-base-2.12.8.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.2.ebuild b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.13.2.ebuild
rename to app-admin/ansible-core/ansible-core-2.13.2.ebuild
index 20a3a7eaa8dd2..49cb6548905c4 100644
--- a/app-admin/ansible-base/ansible-base-2.13.2.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-2.13.3.ebuild b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
similarity index 91%
rename from app-admin/ansible-base/ansible-base-2.13.3.ebuild
rename to app-admin/ansible-core/ansible-core-2.13.3.ebuild
index 87c538eaf16d5..d4dfeb1854322 100644
--- a/app-admin/ansible-base/ansible-base-2.13.3.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
similarity index 89%
rename from app-admin/ansible-base/ansible-base-9999.ebuild
rename to app-admin/ansible-core/ansible-core-9999.ebuild
index caee1ffe1113b..10e608c937a91 100644
--- a/app-admin/ansible-base/ansible-base-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-core/metadata.xml
similarity index 95%
rename from app-admin/ansible-base/metadata.xml
rename to app-admin/ansible-core/metadata.xml
index 3f94edf04c28f..92fba02125080 100644
--- a/app-admin/ansible-base/metadata.xml
+++ b/app-admin/ansible-core/metadata.xml
@@ -10,7 +10,7 @@
     <name>Patrice Clement</name>
   </maintainer>
   <upstream>
-  <remote-id type="pypi">ansible-base</remote-id>
+  <remote-id type="pypi">ansible-core</remote-id>
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
index 071feb3061bb2..bc3e252daa8c5 100644
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
 	>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
index 25c5750d037c1..71e510a4133d4 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
 	>=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
 	dev-python/black[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild
index d96231433bb46..a932683ff21dc 100644
--- a/app-admin/ansible/ansible-4.6.0.ebuild
+++ b/app-admin/ansible/ansible-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.11.1
-	<app-admin/ansible-base-2.12"
+RDEPEND=">=app-admin/ansible-core-2.11.1
+	<app-admin/ansible-core-2.12"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.10.0.ebuild b/app-admin/ansible/ansible-5.10.0.ebuild
index 999bc1a1edb86..10da86624659d 100644
--- a/app-admin/ansible/ansible-5.10.0.ebuild
+++ b/app-admin/ansible/ansible-5.10.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+	<app-admin/ansible-core-2.13"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-5.9.0.ebuild b/app-admin/ansible/ansible-5.9.0.ebuild
index 21e85e45cd014..187c0ab3cccb0 100644
--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ b/app-admin/ansible/ansible-5.9.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
+RDEPEND=">=app-admin/ansible-core-2.12.0
+	<app-admin/ansible-core-2.13"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.1.0.ebuild b/app-admin/ansible/ansible-6.1.0.ebuild
index 162e798cc5b41..2117a72eafcb1 100644
--- a/app-admin/ansible/ansible-6.1.0.ebuild
+++ b/app-admin/ansible/ansible-6.1.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.13.0
-	<app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/app-admin/ansible/ansible-6.2.0.ebuild b/app-admin/ansible/ansible-6.2.0.ebuild
index 6edb26b0dbf7e..dc69c24b7721d 100644
--- a/app-admin/ansible/ansible-6.2.0.ebuild
+++ b/app-admin/ansible/ansible-6.2.0.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 RESTRICT="test"
 
-RDEPEND=">=app-admin/ansible-base-2.13.0
-	<app-admin/ansible-base-2.14"
+RDEPEND=">=app-admin/ansible-core-2.13.0
+	<app-admin/ansible-core-2.14"
 
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
index 7f566730059fd..438acfa7dc999 100644
--- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
index 36ec1e0751354..5abc44e6b8deb 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 1bfc099be13f4..6dc55ad9a1bc1 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -3,7 +3,7 @@
 
 # Various packages requiring Rust.
 app-admin/ansible
-app-admin/ansible-base
+app-admin/ansible-core
 app-crypt/acme
 app-crypt/certbot
 app-crypt/certbot-nginx
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 2cdcd10dc1c9e..91742f7d8e706 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -12,3 +12,4 @@ move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
 move dev-python/PyQt6_sip dev-python/PyQt6-sip
 move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
 move net-p2p/go-ipfs net-p2p/kubo
+move app-admin/ansible-base app-admin/ansible-core