diff --git a/dev-python/cryptg/metadata.xml b/dev-python/cryptg/metadata.xml
index 6e3807db4e..4c72f4374a 100644
--- a/dev-python/cryptg/metadata.xml
+++ b/dev-python/cryptg/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/dev-python/hachoir/metadata.xml b/dev-python/hachoir/metadata.xml
index 7261037ec7..57627bb8a6 100644
--- a/dev-python/hachoir/metadata.xml
+++ b/dev-python/hachoir/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/dev-python/mautrix/metadata.xml b/dev-python/mautrix/metadata.xml
index cd40cb4714..f4b10200a5 100644
--- a/dev-python/mautrix/metadata.xml
+++ b/dev-python/mautrix/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/dev-python/olm/metadata.xml b/dev-python/olm/metadata.xml
index a4b44a3909..0e9314a833 100644
--- a/dev-python/olm/metadata.xml
+++ b/dev-python/olm/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<doc>https://poljar.github.io/python-olm/html/index.html</doc>
diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml
index ecc8d75f8a..5dfc64c0ab 100644
--- a/dev-python/pytest-isort/metadata.xml
+++ b/dev-python/pytest-isort/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">moccu/pytest-isort</remote-id>
diff --git a/dev-python/tulir-telethon/metadata.xml b/dev-python/tulir-telethon/metadata.xml
index e0a966db44..b7b496892e 100644
--- a/dev-python/tulir-telethon/metadata.xml
+++ b/dev-python/tulir-telethon/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/net-im/heisenbridge/metadata.xml b/net-im/heisenbridge/metadata.xml
index ca25c60428..aeabfa747f 100644
--- a/net-im/heisenbridge/metadata.xml
+++ b/net-im/heisenbridge/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/net-im/mautrix-discord/metadata.xml b/net-im/mautrix-discord/metadata.xml
index 88c9bccab8..9141d51c1f 100644
--- a/net-im/mautrix-discord/metadata.xml
+++ b/net-im/mautrix-discord/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/net-im/mautrix-facebook/metadata.xml b/net-im/mautrix-facebook/metadata.xml
index 23daf1e237..98228eacc1 100644
--- a/net-im/mautrix-facebook/metadata.xml
+++ b/net-im/mautrix-facebook/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/net-im/mautrix-slack/metadata.xml b/net-im/mautrix-slack/metadata.xml
index 88c9bccab8..9141d51c1f 100644
--- a/net-im/mautrix-slack/metadata.xml
+++ b/net-im/mautrix-slack/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/net-im/mautrix-telegram/metadata.xml b/net-im/mautrix-telegram/metadata.xml
index 233fdb479d..e42fddd1d5 100644
--- a/net-im/mautrix-telegram/metadata.xml
+++ b/net-im/mautrix-telegram/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Julien Roy</name>
 		<email>julien@jroy.ca</email>
-		<description>Julien Roy</description>
 	</maintainer>
 	<upstream>
 		<maintainer>