diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
index 499dbdb4d54a9..d651fd037d3d1 100644
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@@ -9,7 +9,7 @@
Nextcloud
1.1.0
-
+
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 2c207610599a9..2bd28dd89542c 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -8,7 +8,7 @@
1.0.0
-
+
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 853e0e1bd9efd..805027c516bb0 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -15,7 +15,7 @@
appinfo/v1/publicwebdav.php
-
+
OCA\DAV\CardDAV\Sync\SyncJob
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 8354068b17e82..83f4107384d43 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -25,7 +25,7 @@
openssl
-
+
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index 6470d43d4b17b..711ee091d8fbe 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -9,6 +9,6 @@
FederatedFileSharing
other
-
+
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index c6d1debd108b0..55491f38b55ec 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -9,7 +9,7 @@
Federation
other
-
+
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 704ab830fc4d7..8b26a6af7110f 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -11,7 +11,7 @@
-
+
user-files
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 9bdd528990e09..e8bf11498aedd 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -22,6 +22,6 @@
Files_External
-
+
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 723f7e15d1217..240b5e6193331 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -15,7 +15,7 @@ Turning the feature off removes shared files and folders on the server for all s
-
+
public.php
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 000dd12274525..2b19ba6fe1111 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -16,7 +16,7 @@ To prevent a user from running out of disk space, the Deleted files app will not
Files_Trashbin
-
+
user-trashbin
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index bf6f146feb05c..b167104016a90 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -15,7 +15,7 @@ In addition to the expiry of versions, the versions app makes certain never to u
Files_Versions
-
+
user-versions
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index 84f9d99beb1c5..2f62ff69b17b3 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -23,6 +23,6 @@
-
+
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 9f473fb2506da..1d75610f54562 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -9,7 +9,7 @@
1.0.0
-
+
SystemTags
diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml
index 4b81437c53cd7..1ab6e67805af0 100644
--- a/apps/testing/appinfo/info.xml
+++ b/apps/testing/appinfo/info.xml
@@ -7,6 +7,6 @@
Joas Schilling
1.0.0
-
+
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml
index c7d4e40519996..2cc18672a3b30 100644
--- a/apps/theming/appinfo/info.xml
+++ b/apps/theming/appinfo/info.xml
@@ -10,7 +10,7 @@
other
-
+
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 55c6fba068367..080438273704e 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -9,7 +9,7 @@
UpdateNotification
-
+
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index fc44a01687e3e..b3141ec0c765a 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -18,7 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
ldap
-
+
User_LDAP