diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 441d2a8..bc7b162 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -103,10 +103,10 @@ jobs:
           rm -rf build
           cmake -Bbuild -DENABLE_CT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DMAYO_MARCH="-march=haswell -maes"
           cmake --build build
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_1
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_2
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_3
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_5
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-1
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-2
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-3
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-5
       if: matrix.mayo_build_type == 'ref'
 
     - name: Memcheck
@@ -114,10 +114,10 @@ jobs:
           rm -rf build
           cmake -Bbuild -DCMAKE_BUILD_TYPE=Debug -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DMAYO_MARCH="-march=haswell -maes"
           cmake --build build
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_1
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_2
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_3
-          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO_5
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-1
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-2
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-3
+          valgrind --error-exitcode=1 --track-origins=yes build/test/mayo_test_scheme MAYO-5
       if: matrix.mayo_build_type == 'ref'
 
     - name: Memcheck
@@ -136,25 +136,25 @@ jobs:
           rm -rf build
           cmake -Bbuild -DCMAKE_BUILD_TYPE=ASAN -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=clang
           cmake --build build
-          ctest -v --test-dir build
+          ctest -V --test-dir build
 
     - name: Memory Sanitizer MSAN
       run: |
           rm -rf build
           cmake -Bbuild -DCMAKE_BUILD_TYPE=MSAN -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=clang
           cmake --build build
-          ctest -v --test-dir build
+          ctest -V --test-dir build
 
     - name: Leak Sanitizer LSAN
       run: |
           rm -rf build
           cmake -Bbuild -DCMAKE_BUILD_TYPE=LSAN -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=clang
           cmake --build build
-          ctest -v --test-dir build
+          ctest -V --test-dir build
 
     - name: Undefined Behavior Sanitizer UBSAN
       run: |
           rm -rf build
           cmake -Bbuild -DCMAKE_BUILD_TYPE=UBSAN -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=clang
           cmake --build build
-          ctest -v --test-dir build
+          ctest -V --test-dir build
diff --git a/META/MAYO_1_META.yml b/META/MAYO-1_META.yml
similarity index 99%
rename from META/MAYO_1_META.yml
rename to META/MAYO-1_META.yml
index 70beb97..5b15a80 100644
--- a/META/MAYO_1_META.yml
+++ b/META/MAYO-1_META.yml
@@ -1,4 +1,4 @@
-name: MAYO_1
+name: MAYO-1
 type: signature
 claimed-nist-level: 1
 length-public-key: 1168
diff --git a/META/MAYO_2_META.yml b/META/MAYO-2_META.yml
similarity index 99%
rename from META/MAYO_2_META.yml
rename to META/MAYO-2_META.yml
index 5606a1b..61ea3f0 100644
--- a/META/MAYO_2_META.yml
+++ b/META/MAYO-2_META.yml
@@ -1,4 +1,4 @@
-name: MAYO_2
+name: MAYO-2
 type: signature
 claimed-nist-level: 1
 length-public-key: 5488
diff --git a/META/MAYO_3_META.yml b/META/MAYO-3_META.yml
similarity index 99%
rename from META/MAYO_3_META.yml
rename to META/MAYO-3_META.yml
index 3a2516c..eaf2413 100644
--- a/META/MAYO_3_META.yml
+++ b/META/MAYO-3_META.yml
@@ -1,4 +1,4 @@
-name: MAYO_3
+name: MAYO-3
 type: signature
 claimed-nist-level: 3
 length-public-key: 2656
diff --git a/META/MAYO_5_META.yml b/META/MAYO-5_META.yml
similarity index 99%
rename from META/MAYO_5_META.yml
rename to META/MAYO-5_META.yml
index e0db318..577b65d 100644
--- a/META/MAYO_5_META.yml
+++ b/META/MAYO-5_META.yml
@@ -1,4 +1,4 @@
-name: MAYO_5
+name: MAYO-5
 type: signature
 claimed-nist-level: 5
 length-public-key: 5008
diff --git a/src/mayo_1/api.h b/src/mayo_1/api.h
index 07a2f67..86b7bd5 100644
--- a/src/mayo_1/api.h
+++ b/src/mayo_1/api.h
@@ -9,7 +9,7 @@
 #define CRYPTO_PUBLICKEYBYTES 1168
 #define CRYPTO_BYTES 321
 
-#define CRYPTO_ALGNAME "MAYO_1"
+#define CRYPTO_ALGNAME "MAYO-1"
 
 #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair)
 int
diff --git a/src/mayo_2/api.h b/src/mayo_2/api.h
index 7c38c1a..265a563 100644
--- a/src/mayo_2/api.h
+++ b/src/mayo_2/api.h
@@ -9,7 +9,7 @@
 #define CRYPTO_PUBLICKEYBYTES 5488
 #define CRYPTO_BYTES 180
 
-#define CRYPTO_ALGNAME "MAYO_2"
+#define CRYPTO_ALGNAME "MAYO-2"
 
 #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair)
 int
diff --git a/src/mayo_3/api.h b/src/mayo_3/api.h
index 47899c1..b08c247 100644
--- a/src/mayo_3/api.h
+++ b/src/mayo_3/api.h
@@ -9,7 +9,7 @@
 #define CRYPTO_PUBLICKEYBYTES 2656
 #define CRYPTO_BYTES 577
 
-#define CRYPTO_ALGNAME "MAYO_3"
+#define CRYPTO_ALGNAME "MAYO-3"
 
 #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair)
 int
diff --git a/src/mayo_5/api.h b/src/mayo_5/api.h
index fa1ebbb..404d185 100644
--- a/src/mayo_5/api.h
+++ b/src/mayo_5/api.h
@@ -9,7 +9,7 @@
 #define CRYPTO_PUBLICKEYBYTES 5008
 #define CRYPTO_BYTES 838
 
-#define CRYPTO_ALGNAME "MAYO_5"
+#define CRYPTO_ALGNAME "MAYO-5"
 
 #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair)
 int
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f3be92b..e055b63 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,14 +11,14 @@ if (ENABLE_PARAMS_DYNAMIC)
     target_link_libraries(mayo_test_scheme mayo)
     target_include_directories(mayo_test_scheme PUBLIC ../src/common)
 
-    add_test(MAYO_1_KAT mayo_test_kat MAYO_1)
-    add_test(MAYO_2_KAT mayo_test_kat MAYO_2)
-    add_test(MAYO_3_KAT mayo_test_kat MAYO_3)
-    add_test(MAYO_5_KAT mayo_test_kat MAYO_5)
-    add_test(MAYO_1_SELFTEST mayo_test_scheme MAYO_1)
-    add_test(MAYO_2_SELFTEST mayo_test_scheme MAYO_2)
-    add_test(MAYO_3_SELFTEST mayo_test_scheme MAYO_3)
-    add_test(MAYO_5_SELFTEST mayo_test_scheme MAYO_5)
+    add_test(MAYO_1_KAT mayo_test_kat MAYO-1)
+    add_test(MAYO_2_KAT mayo_test_kat MAYO-2)
+    add_test(MAYO_3_KAT mayo_test_kat MAYO-3)
+    add_test(MAYO_5_KAT mayo_test_kat MAYO-5)
+    add_test(MAYO_1_SELFTEST mayo_test_scheme MAYO-1)
+    add_test(MAYO_2_SELFTEST mayo_test_scheme MAYO-2)
+    add_test(MAYO_3_SELFTEST mayo_test_scheme MAYO-3)
+    add_test(MAYO_5_SELFTEST mayo_test_scheme MAYO-5)
 else()
     FOREACH(MVARIANT ${MVARIANT_S})
         string(TOLOWER ${MVARIANT} MVARIANT_LOWER)
diff --git a/test/bench.c b/test/bench.c
index a33b776..d551286 100644
--- a/test/bench.c
+++ b/test/bench.c
@@ -29,13 +29,13 @@ int main(int argc, char *argv[]) {
         goto end;
     }
     int runs = atoi(argv[2]);
-    if (!strcmp(argv[1], "MAYO_1")) {
+    if (!strcmp(argv[1], "MAYO-1")) {
         rc = bench_sig(&MAYO_1, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_2")) {
+    } else if (!strcmp(argv[1], "MAYO-2")) {
         rc = bench_sig(&MAYO_2, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_3")) {
+    } else if (!strcmp(argv[1], "MAYO-3")) {
         rc = bench_sig(&MAYO_3, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_5")) {
+    } else if (!strcmp(argv[1], "MAYO-5")) {
         rc = bench_sig(&MAYO_5, runs, 0);
     }
 #else
diff --git a/test/bench_mayo_table3.c b/test/bench_mayo_table3.c
index c340328..7a0ee93 100644
--- a/test/bench_mayo_table3.c
+++ b/test/bench_mayo_table3.c
@@ -30,13 +30,13 @@ int main(int argc, char *argv[]) {
         goto end;
     }
     int runs = atoi(argv[2]);
-    if (!strcmp(argv[1], "MAYO_1")) {
+    if (!strcmp(argv[1], "MAYO-1")) {
         rc = bench_sig(&MAYO_1, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_2")) {
+    } else if (!strcmp(argv[1], "MAYO-2")) {
         rc = bench_sig(&MAYO_2, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_3")) {
+    } else if (!strcmp(argv[1], "MAYO-3")) {
         rc = bench_sig(&MAYO_3, runs, 0);
-    } else if (!strcmp(argv[1], "MAYO_5")) {
+    } else if (!strcmp(argv[1], "MAYO-5")) {
         rc = bench_sig(&MAYO_5, runs, 0);
     }
 #else
diff --git a/test/test_kat.c b/test/test_kat.c
index 28596cc..005b7c5 100644
--- a/test/test_kat.c
+++ b/test/test_kat.c
@@ -37,13 +37,13 @@ int main(int argc, char *argv[]) {
         goto end;
     }
 
-    if (!strcmp(argv[1], "MAYO_1")) {
+    if (!strcmp(argv[1], "MAYO-1")) {
         rc = test_sig_kat(&MAYO_1);
-    } else if (!strcmp(argv[1], "MAYO_2")) {
+    } else if (!strcmp(argv[1], "MAYO-2")) {
         rc = test_sig_kat(&MAYO_2);
-    } else if (!strcmp(argv[1], "MAYO_3")) {
+    } else if (!strcmp(argv[1], "MAYO-3")) {
         rc = test_sig_kat(&MAYO_3);
-    } else if (!strcmp(argv[1], "MAYO_5")) {
+    } else if (!strcmp(argv[1], "MAYO-5")) {
         rc = test_sig_kat(&MAYO_5);
     } else {
         return -1;
diff --git a/test/test_mayo.c b/test/test_mayo.c
index be2c664..5c50688 100644
--- a/test/test_mayo.c
+++ b/test/test_mayo.c
@@ -105,13 +105,13 @@ int main(int argc, char *argv[]) {
     int rc = 0;
 
 #ifdef ENABLE_PARAMS_DYNAMIC
-    if (!strcmp(argv[1], "MAYO_1")) {
+    if (!strcmp(argv[1], "MAYO-1")) {
         rc = test_mayo(&MAYO_1);
-    } else if (!strcmp(argv[1], "MAYO_2")) {
+    } else if (!strcmp(argv[1], "MAYO-2")) {
         rc = test_mayo(&MAYO_2);
-    } else if (!strcmp(argv[1], "MAYO_3")) {
+    } else if (!strcmp(argv[1], "MAYO-3")) {
         rc = test_mayo(&MAYO_3);
-    } else if (!strcmp(argv[1], "MAYO_5")) {
+    } else if (!strcmp(argv[1], "MAYO-5")) {
         rc = test_mayo(&MAYO_5);
     }
 #else