diff --git a/crypto_kem/frodokem1344aes/META.yml b/crypto_kem/frodokem1344aes/META.yml
index 6227c1ce..15830d51 100644
--- a/crypto_kem/frodokem1344aes/META.yml
+++ b/crypto_kem/frodokem1344aes/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 21632
 length-shared-secret: 32
 testvectors-sha256: 91dce2e12200afc88f951aff9349b72d1dda6e53e305135a891aa1a67ef88352
 nistkat-sha256: 2f4f1c352c1b343cce386c54234ca39fe29b48e45c66300f7311f5d3060d82b3
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations:
diff --git a/crypto_kem/frodokem1344shake/META.yml b/crypto_kem/frodokem1344shake/META.yml
index 0c33e721..1e770eef 100644
--- a/crypto_kem/frodokem1344shake/META.yml
+++ b/crypto_kem/frodokem1344shake/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 21632
 length-shared-secret: 32
 testvectors-sha256: 8b62fc01fc1e4b4e336776b09b37aaf55d161b7c815b3298f39d4444b011e10c
 nistkat-sha256: 6e54e319cc590c3f136af81990a04cd0009ef78dec92825d2eb834adfec661dc
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations:
diff --git a/crypto_kem/frodokem640aes/META.yml b/crypto_kem/frodokem640aes/META.yml
index f33e44f4..9aec49f6 100644
--- a/crypto_kem/frodokem640aes/META.yml
+++ b/crypto_kem/frodokem640aes/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 9720
 length-shared-secret: 16
 testvectors-sha256: d4c7d30254a8cac8ad73b742b31813e47dcae6532a4dcbe13c04d72a2920a086
 nistkat-sha256: c1f006531583896c47416e10707d1c8e487fe549df304d7a9c43155d5e47b8b6
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations:
diff --git a/crypto_kem/frodokem640shake/META.yml b/crypto_kem/frodokem640shake/META.yml
index bec8108b..bd4181cd 100644
--- a/crypto_kem/frodokem640shake/META.yml
+++ b/crypto_kem/frodokem640shake/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 9720
 length-shared-secret: 16
 testvectors-sha256: 8f922de02d41005fcc3c4164b2ab74c4c7b588ed69e34e22607d1ae4ab13d2c5
 nistkat-sha256: df2b77b8e108c61d16c78a99e79f3351ab15840a690f25c1f87a8e89295e9219
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations:
diff --git a/crypto_kem/frodokem976aes/META.yml b/crypto_kem/frodokem976aes/META.yml
index be20b7f0..01687096 100644
--- a/crypto_kem/frodokem976aes/META.yml
+++ b/crypto_kem/frodokem976aes/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 15744
 length-shared-secret: 24
 testvectors-sha256: 30a2a3f2d834b5d90cd10241f53c4a4379abeea0dbd4eb65b260749b2ba81391
 nistkat-sha256: 7e415ab659d0d08d8f43135e1e9d75a8b342f52b65e8326ebf8135521b987615
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations:
diff --git a/crypto_kem/frodokem976shake/META.yml b/crypto_kem/frodokem976shake/META.yml
index 552616a2..13b98d2b 100644
--- a/crypto_kem/frodokem976shake/META.yml
+++ b/crypto_kem/frodokem976shake/META.yml
@@ -6,17 +6,17 @@ length-ciphertext: 15744
 length-shared-secret: 24
 testvectors-sha256: 00707dc8158c6e51e70e9a7b23a87054c5f2167b77a2e5940b8e82519834717b
 nistkat-sha256: 0d3d3a3ad11b69a93e72f1233b310884e97be8d16c9981bf1eb1321880cd0658
-principal-submitter: Douglas Stebila, University of Waterloo
+principal-submitter: Michael Naehrig, Microsoft Research
 auxiliary-submitters:
 - Erdem Alkim
 - Joppe W. Bos, NXP Semiconductors
 - Léo Ducas, CWI
 - Patrick Longa, Microsoft Research
 - Ilya Mironov, Google
-- Michael Naehrig, Microsoft Research
 - Valeria Nikolaenko
 - Chris Peikert, University of Michigan
 - Ananth Raghunathan, Google
+- Douglas Stebila, University of Waterloo
 - Karen Easterbrook, Microsoft Research
 - Brian LaMacchia, Microsoft Research
 implementations: