diff --git a/dev-python/cliff/cliff-4.2.0.ebuild b/dev-python/cliff/cliff-4.2.0.ebuild
index 05639f5c552ac..6ea1b97c76b23 100644
--- a/dev-python/cliff/cliff-4.2.0.ebuild
+++ b/dev-python/cliff/cliff-4.2.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
index cd758fbb0d2e3..e2dc4187683f0 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	dev-util/patchelf
 	virtual/libcrypt:=
 	$(python_gen_cond_dep '
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
index 5d0805d109220..95857e29f8698 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	dev-util/patchelf
 	virtual/libcrypt:=
 	$(python_gen_cond_dep '
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
index 0c7a33ecf5bd9..1fa9e1750347d 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.9)
 	dev-util/patchelf
 	virtual/libcrypt:=
diff --git a/dev-python/dask/dask-2023.3.2.ebuild b/dev-python/dask/dask-2023.3.2.ebuild
index abe01ee1aee39..7ddc06075f6ae 100644
--- a/dev-python/dask/dask-2023.3.2.ebuild
+++ b/dev-python/dask/dask-2023.3.2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
 	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2023.4.0.ebuild b/dev-python/dask/dask-2023.4.0.ebuild
index 3176aad61c51d..e6a446e10f3b8 100644
--- a/dev-python/dask/dask-2023.4.0.ebuild
+++ b/dev-python/dask/dask-2023.4.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-1.1.1[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
 	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
index 3ea8911b102b7..61b3bb1da8947 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/flask-2.2.3.ebuild b/dev-python/flask/flask-2.2.3.ebuild
index 964ac1d019103..c478dd8ddc0ff 100644
--- a/dev-python/flask/flask-2.2.3.ebuild
+++ b/dev-python/flask/flask-2.2.3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-2.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6.0[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
index e56a90a6b6434..3766a309a6b8e 100644
--- a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 )
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib-metadata/Manifest
similarity index 100%
rename from dev-python/importlib_metadata/Manifest
rename to dev-python/importlib-metadata/Manifest
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
similarity index 100%
rename from dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild
rename to dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.5.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
similarity index 100%
rename from dev-python/importlib_metadata/importlib_metadata-6.5.0.ebuild
rename to dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
diff --git a/dev-python/importlib_metadata/metadata.xml b/dev-python/importlib-metadata/metadata.xml
similarity index 100%
rename from dev-python/importlib_metadata/metadata.xml
rename to dev-python/importlib-metadata/metadata.xml
diff --git a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
index 5b8619ab0d017..078bad324f865 100644
--- a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
index 503ce6564a013..675053085812a 100644
--- a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
index f94d688c03136..10a33a9f9e253 100644
--- a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
index ecaeb7c5b929a..6e4b32461a3cd 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
index 8f9b6f8ccb4f5..bd7d147fe4894 100644
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
+++ b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/y-py-0.7.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
index b3b9f406c2a3c..b677d553fda19 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
index b3b9f406c2a3c..b677d553fda19 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/keyring/keyring-23.13.1-r1.ebuild b/dev-python/keyring/keyring-23.13.1-r1.ebuild
index 33d7bf5c5b55d..4e76a9b5963b3 100644
--- a/dev-python/keyring/keyring-23.13.1-r1.ebuild
+++ b/dev-python/keyring/keyring-23.13.1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.4[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10 3.11)
 	$(python_gen_cond_dep '
 		dev-python/importlib-resources
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index d2c1b1b5ef7a7..8eac151196e62 100644
--- a/dev-python/markdown/markdown-3.3.7.ebuild
+++ b/dev-python/markdown/markdown-3.3.7.ebuild
@@ -22,7 +22,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)"
 BDEPEND="
 	test? (
diff --git a/dev-python/markdown/markdown-3.4.1.ebuild b/dev-python/markdown/markdown-3.4.1.ebuild
index 894358a673704..f4bf4a2ca9a35 100644
--- a/dev-python/markdown/markdown-3.4.1.ebuild
+++ b/dev-python/markdown/markdown-3.4.1.ebuild
@@ -25,7 +25,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/markdown/markdown-3.4.3.ebuild b/dev-python/markdown/markdown-3.4.3.ebuild
index 0c3402deb09f0..9cdc1fa349e2b 100644
--- a/dev-python/markdown/markdown-3.4.3.ebuild
+++ b/dev-python/markdown/markdown-3.4.3.ebuild
@@ -24,7 +24,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/matrix-common/matrix-common-1.3.0.ebuild b/dev-python/matrix-common/matrix-common-1.3.0.ebuild
index 6245d546b3fc7..fd8a94e1ae4f4 100644
--- a/dev-python/matrix-common/matrix-common-1.3.0.ebuild
+++ b/dev-python/matrix-common/matrix-common-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/mkdocs/mkdocs-1.4.2.ebuild b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
index 6f956222fb1ff..9465fb8d43ea0 100644
--- a/dev-python/mkdocs/mkdocs-1.4.2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
 	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
 	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
index 246ad4c165545..8a9e062190f1b 100644
--- a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.2.9.ebuild b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
index 82af77a2e7dc4..b2291dac10df8 100644
--- a/dev-python/nbconvert/nbconvert-7.2.9.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.0.ebuild b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
index 5f78072d38d16..030eb09c5ff6c 100644
--- a/dev-python/nbconvert/nbconvert-7.3.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index 77c4e2b2a1f3e..cb241abc93f16 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nspektr/nspektr-0.4.0.ebuild b/dev-python/nspektr/nspektr-0.4.0.ebuild
index 09339ae80cd67..feb50f9cf33e5 100644
--- a/dev-python/nspektr/nspektr-0.4.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.4.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.2[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.2[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 
diff --git a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
index 710d61c3f4637..8bc3e8779f00b 100644
--- a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/oslo-config-9.1.1.ebuild b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
index 1174ed7064a52..fcb6357ac116e 100644
--- a/dev-python/oslo-config/oslo-config-9.1.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-67.6.1.ebuild b/dev-python/setuptools/setuptools-67.6.1.ebuild
index 9638410a9e9cb..164d1f7d0206f 100644
--- a/dev-python/setuptools/setuptools-67.6.1.ebuild
+++ b/dev-python/setuptools/setuptools-67.6.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/signedjson/signedjson-1.1.4.ebuild b/dev-python/signedjson/signedjson-1.1.4.ebuild
index 8c361d0b228ff..10a241fb217b9 100644
--- a/dev-python/signedjson/signedjson-1.1.4.ebuild
+++ b/dev-python/signedjson/signedjson-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/pynacl[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' python3_9)
 "
 
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index d26e19bcd8a48..97e87fe600ade 100644
--- a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.4[${PYTHON_USEDEP}]
 	' python3_{8,9} pypy3)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx/sphinx-5.3.0.ebuild b/dev-python/sphinx/sphinx-5.3.0.ebuild
index 8a395c538c8f6..59f6b07a942b6 100644
--- a/dev-python/sphinx/sphinx-5.3.0.ebuild
+++ b/dev-python/sphinx/sphinx-5.3.0.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx/sphinx-6.1.3.ebuild b/dev-python/sphinx/sphinx-6.1.3.ebuild
index 47c0067bed8d4..03ffa67fb3ad6 100644
--- a/dev-python/sphinx/sphinx-6.1.3.ebuild
+++ b/dev-python/sphinx/sphinx-6.1.3.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
index 081b40e9be740..8bd3e48610565 100644
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	>=dev-python/pybtex-0.24[${PYTHON_USEDEP}]
 	>=dev-python/pybtex-docutils-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index c78faa3cc4ab0..992ac6af8345a 100644
--- a/dev-python/twine/twine-4.0.2.ebuild
+++ b/dev-python/twine/twine-4.0.2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
 	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
 	>=dev-python/readme_renderer-35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/typeguard-3.0.2.ebuild b/dev-python/typeguard/typeguard-3.0.2.ebuild
index 3f32cac8a6c10..5502867a6a8a3 100644
--- a/dev-python/typeguard/typeguard-3.0.2.ebuild
+++ b/dev-python/typeguard/typeguard-3.0.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.{8..9})
 	$(python_gen_cond_dep '
 		>=dev-python/typing-extensions-4.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/versioningit/versioningit-2.2.0.ebuild b/dev-python/versioningit/versioningit-2.2.0.ebuild
index 03c79ae142bb0..f277575c6d8ba 100644
--- a/dev-python/versioningit/versioningit-2.2.0.ebuild
+++ b/dev-python/versioningit/versioningit-2.2.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	$(python_gen_cond_dep '
 		<dev-python/tomli-3[${PYTHON_USEDEP}]
diff --git a/dev-util/rbtools/rbtools-4.0-r1.ebuild b/dev-util/rbtools/rbtools-4.0-r1.ebuild
index 90d74a5b8e534..928f6fd60c974 100644
--- a/dev-util/rbtools/rbtools-4.0-r1.ebuild
+++ b/dev-util/rbtools/rbtools-4.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/importlib_metadata-4.12[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.12[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	>=dev-python/pydiffx-1.1[${PYTHON_USEDEP}]
 	=dev-python/pydiffx-1.1*[${PYTHON_USEDEP}]
diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild b/media-gfx/cura/cura-4.13.1-r1.ebuild
index 2d88c216d7bfe..f7135c103b28a 100644
--- a/media-gfx/cura/cura-4.13.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS}
 	~media-gfx/fdm-materials-${FDM_MATERIALS_PV}
 	dev-qt/qtquickcontrols[widgets]
 	$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+			dev-python/importlib-metadata[${PYTHON_USEDEP}]
 			dev-python/keyring[${PYTHON_USEDEP}]
 			dev-python/mypy[${PYTHON_USEDEP}]
 			dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index 773d4826f3366..c8c8a880e73dd 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -2,3 +2,4 @@ move dev-python/jupyter_core dev-python/jupyter-core
 move dev-python/mkdocs_pymdownx_material_extras dev-python/mkdocs-pymdownx-material-extras
 move dev-python/jupyter_client dev-python/jupyter-client
 move dev-python/importlib_resources dev-python/importlib-resources
+move dev-python/importlib_metadata dev-python/importlib-metadata