diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_ietf_vectors.json b/data/vectors/bandersnatch_ed_sha512_ell2_ietf.json
similarity index 90%
rename from data/vectors/bandersnatch_ed_sha512_ell2_ietf_vectors.json
rename to data/vectors/bandersnatch_ed_sha512_ell2_ietf.json
index b346c37..b23decd 100644
--- a/data/vectors/bandersnatch_ed_sha512_ell2_ietf_vectors.json
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_ietf.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-1",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
     "alpha": "",
@@ -13,7 +13,7 @@
     "proof_s": "828bedd2ad95380b11f67a05ea0a76f0c3fef2bee9f043f4dffdddde09f55c01"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-2",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
     "alpha": "0a",
@@ -26,7 +26,7 @@
     "proof_s": "18c74ffd67e6abc658e2d05ecd3101ddc0c33623823f2395538cf8d39e654f12"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-3",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
     "alpha": "",
@@ -39,7 +39,7 @@
     "proof_s": "54e5d38a76f309ce63ca82465160abd8d75b78805a0b499e60c26436de4a8e01"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-4",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
     "alpha": "73616d706c65",
@@ -52,7 +52,7 @@
     "proof_s": "e8e34ad3131388a88eb7f80bd874f3421c378d4ad45911c4bc16e4cdc17b5716"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-5",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -65,7 +65,7 @@
     "proof_s": "4c1269d9d161dabd082fc606af979eca7f6c3ab68e78261dc6fb9fbbb98c9704"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-6",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -78,7 +78,7 @@
     "proof_s": "0f7f9bee9077427f547e69b919cf8d63823c14b20085fd9516768e0f5e3d3f0e"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ietf_vectors - vector-7",
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_pedersen_vectors.json b/data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json
similarity index 93%
rename from data/vectors/bandersnatch_ed_sha512_ell2_pedersen_vectors.json
rename to data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json
index ad01910..4f1f7ae 100644
--- a/data/vectors/bandersnatch_ed_sha512_ell2_pedersen_vectors.json
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-1",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
     "alpha": "",
@@ -17,7 +17,7 @@
     "proof_sb": "99f87c403f11d997ee5a3c4f6fb51237d1930b6a5de475cffd397bb0adf29809"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-2",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
     "alpha": "0a",
@@ -34,7 +34,7 @@
     "proof_sb": "8e4cc0ed30b278983ee484e0e9e725c2db9864a709e38d558e77c02e0045c208"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-3",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
     "alpha": "",
@@ -51,7 +51,7 @@
     "proof_sb": "9eaa98e4c670a61a70ed4e8a9d3670aeebac82d99a241687d676e235d86e370e"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-4",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
     "alpha": "73616d706c65",
@@ -68,7 +68,7 @@
     "proof_sb": "38902aa4247539fbd8dffc217123d2057eab3a1cbc9a05e17bf2da773f147405"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-5",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -85,7 +85,7 @@
     "proof_sb": "14e82ee7b96487ebe7a57db04eac22512a138e4bcb55b9d1186f859dab37ed11"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-6",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -102,7 +102,7 @@
     "proof_sb": "2e531e6fda5a65120809f3ef98e10c70abf17f3380449c7b3ff20cbe6a22e107"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_pedersen_vectors - vector-7",
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_ring_vectors.json b/data/vectors/bandersnatch_ed_sha512_ell2_ring.json
similarity index 97%
rename from data/vectors/bandersnatch_ed_sha512_ell2_ring_vectors.json
rename to data/vectors/bandersnatch_ed_sha512_ell2_ring.json
index de9ee61..bb1fb5f 100644
--- a/data/vectors/bandersnatch_ed_sha512_ell2_ring_vectors.json
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_ring.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-1",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
     "alpha": "",
@@ -20,7 +20,7 @@
     "ring_proof": "98bc465cdf55ee0799bc25a80724d02bb2471cd7d065d9bd53a3a7e3416051f6e3686f7c6464c364b9f2b0f15750426a9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd95d4ffeef4d92464a597880dae011841f8dd457ca5c3bcfb6b98146f0679dd890be8c0c68ef4f543dcba04d86904c883886826b4d57636231717262449efd1c838b0bd4bf0e704a56c46af3f7fbe3539ea3d5a7b312e56edb7e58c22eed5dae28cb1a98736cd9eb9ddf9911ae959f6c121b4c22da91b544f440129fa0e69d41f3b0bdc74b8f9632223c98af1d1b5f2b1cd76cc9db5a8202e03ab580023e4480be1226eeac7daaea5aaa44d59032584f8a0558dacce60137e93b9511feac124321446b8964cd43098cc64e2400ce39e120827609f2c2fcc3a950c1b1e06dba12a20c51ab3659f652237162ede332187e4e797b67248d010c97fb5f7ddc00956579fdeb8d8ca56e9dff1635e35510c8471c124d843c896af2ce50a67d1c73351595589424a93da98a48fd6dd83a25bab9a6669172807ac38a778325a82c96c6630a75d14cb817b410b02dcc0ce7eecf53dbfa864065e1f1830b50bb1c08499c54ba52a1fec66a6a30b1fa233e415f4e6ca91026f6a00b07d488777e7d1d6903743b413a0ad6c0fe6fc30dcde885533fb26a16e2a0d5d980e99c900ca64a8a39db989b37543a37a2c084c0e1660fcdae609467bd87a8d046175e0c5f902b4ddc8bb8e41d1c5293fb0ff9de8a797f55951f9bc77947a6fc5187be4f86709a8025527897fa08aa8cfd0dd8e6e5d4b3bd7453b"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-2",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
     "alpha": "0a",
@@ -40,7 +40,7 @@
     "ring_proof": "a57818b60d8fc54695a66b49a627b158a2f4141c696f0ac41b16831021e0ce5604aaa76fab504c106e4a50621adcbeeb9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb3ac929b4351e8b57201dfc7b92e3faebdd2c25ee3781f11cc7869ebb0c2fb5feb1a23744b298a2fa66c42b04adaa24497ea10324ba0722baa56f1952ec44249a2156ebecf694c69ec16ffd47abc540ef0c4c759c4fb9c1f8004192df5a61997ce62b2f29181d2ea74c5b51225f093e3224b0eb58f06bec3b3fc1134d377cc4b2f117cc57147337b517c1f7d7b57379130d4bf28e23fab66620b09646ad3435e6bdec1a6e7a20c23d0047b0b0f3f4ef8c4063294db9c41c533d66189be0108522d697569e0744c2f595fdfbda1171362a26caaa4c2cd97aae40dc7d48ca93a4023e58e57517e6837c192f1ff620f973b59b06aff3c26a167462b73f5af680d713a0c407b6cca98021352008fa679acbaf02a940c3c7f487ef63dbbbe383cff21a192d0c88d5ad39805fbc089d51abc8b7376c4d1af86b5f0600a470b7b4e6451aca5d6ca74e23085d0cbb8890791b4a2b7194dadd60c623718289521e993aa85f3fa716275d783bca5ab215f654c0991fdbd8d73175a169b82815ad1fb305e88816c64231d54a4582ac35d687e447754872b08f0e9089f32f0ae743298bfc3ff6307a6fbca2fe45a51ce0f3876361429ce0eb59a26ba1133022bc7fab6483f95a73e140feb1776cf62df4cb594fa24ae103f35d8e6a9bf3e0b6d146c8f9892ed76f4639de3ac847b671c426aa1a73553"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-3",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
     "alpha": "",
@@ -60,7 +60,7 @@
     "ring_proof": "a28c6420603f4cd2efd457092ef74585f78eeae389e2ffabf58b9f9dd14ec4db9ffe14be02b7376f6ae7959e11ce1e559107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb721a7367774ca632be13edcf0513bb1bfdb72a0dcdcecab2d1d2411bec12c7d11d6160b7f266dbc54703dcd66efaf99955f08dc523dcbbf9b00767e6f18ab921299d842d793e89865973514968113c2d6558540c5398fa67f7ba4bbcceea615303eaad28b9aa033cc960ad80903393a175239332852bda1e7862068caae9217cb918255bcec373e86f0ba5f076268993ecb8c4f67c337d225955107dc4b6a43b7c0b0512ba33cbe998c4b83d66f3138a9fef98e65eec1daeca268b2ede9164fade86a320583963bd32caf94d77fc4749bccde6536af05ae159fd4c54a8f651f361e6411ff0640c2f9049949a5786444cbc04cc1d7b69a8feb6bfe46f97f65187b2c3a283186a20f3d3ca0ddc34e4c76025ca3ad2f6d3c2da379e70b92ad3a07198c358ab7dfc6a4e9f1a6e9bf44dacb75a48dc8dfef0ba4797cc30af1f02f1d8c3bc4a6de89ad8f7fb4019a19fb2d79fc08eb6c30bca737bb9fc8ec8477efd6f0dc7a7bc681de9a90327a960d43f1118f90393b84ae90d7ae78099c8467d534537594211df2cd7ba5305aad2a7a746ca8c1bd660565ad23beeb1baf8addd3531203217f4c99d453a08de292deb42bf2ca59df067afff00d03533395e472cb58a276bc4a343e39daec726be02506cfa9f255f0ebabcfbdcf5912eca4a6aa92b6632177231b518fde776c6ee1629e35c9"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-4",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
     "alpha": "73616d706c65",
@@ -80,7 +80,7 @@
     "ring_proof": "84c37dff677bda19d7ce202500196edeabb794b0e0970b52a76061d9fc9c396f5d6671db8da091886f4f894775b49a549107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd82e07ea55ee440e81149b38337a6117602874efb0da263aeee9575422ce07cbdd756fa6d9e85d948343468a74f6ed0fd84a67f10c31b6322d8b95442c75abc4c45391bdb9d8d5a61d371931c66ae1e6cc823e217155fbc2eecf27069ed7237e37690f2ddd7cda41df0a6853a2c3ac03da5393792c1b8e04f22bc23b9fa92a30e55ad209307508ba2f74633767ee63e6421689de896eab97be1570e636b0b4e0a93f4ae4d0c89899f68e1904c8a2ce4036066ed17944b3932d17c41089b4e7b2dea8d9c5884c17637150e7837def2a8bfe4b96fd76b40613bf1e7158b0d602722692796fce33c1e937ba562c4715816bd27436477ae63d63519d02fed79b81e0613f91d549a384355750e8b2c133423e923dc12113025087122d3a37378274c234da1e6e9934e21522c5ad9e5425f40e44cdf71bd2bf285e30c06038f19652713b3379b0786202ad6192d543e8e8e597b67eb8536154ae1c38119fdf412c1630a9cfe4d8c4434666c4180df5be5aa5790b1bfcbbb96e55e008c46c784aac8bc366fa2cc672ad966dad3743e6ef99c1a5286ddd9c9809a838b600a715b632bee3465339f4dfc4b0ff23b6bf5c30eec9aa91bd3e6b320d832a383fd4cc68abb11f6b9d19783c103b1be6bddea873abffebc256fd00b9d6da74681d4ffb0aa4f4fe9375210cb6baee3adbd692bc5b7057939"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-5",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -100,7 +100,7 @@
     "ring_proof": "a7185a7a63812926137b53a4776569fe2323e84689e9e2523e03d3c61beb04277bde2c4a2a5e6acecbbfe1c09f16f9899107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb3da35441995afd9ae72767c55776e6e14ff73128a304d7e39b697a2f4a7ec40311c0fa4989b38bae24e1b3c4d8e3162a7c935e743e17d250f0c0f28753c3872decf21ce9bc39d69b53e9e2f62023cc5b201ab16072bf5f137129bfd82b7247463bf34c0ddf644f97c9d7d92bc8357efc16ff36bdae58c675af3364bcc1afc4404733d02d8ccd857a639308a743c9a6cc50dde7da1f2f87590bcebf5a459fa0469af990101e6af73ab99fe3050e536c5b1328bb4b1b57b60f76001f04b8a4c17ea847e828e01c94987c2170ca48160752ac679e2ffdacfd534719a820e71135bd4b1ea5248f90a6648945da5e23030f2ac2d51a61fa5d0f6c53d9dadb63e772a3071d4ea1e2de986c1be5b2ebc0ce377f05c9fc9a7b28c04c1c1a55b4b208b22db6012a4c95d7601f919be0cb2c8e576fbd23bd1b4846641a70f7d11444c1506aa380d402f6479fe90ce25f509180633595d5c3cedf5bde823d9e3f682f220a0d9a7b35429a3e6d95e4c063b11fa608acfda814595b75496a2c723c063baf397515b9d3082e0271d181bc01a4fc3fb128cebc0415eb73507a1a24a0054378f8e334076106fbfed4c64f3794333eb65198e1cac75f9a065df19daa508fc93eb2caaa70fa35c57b021c81b5d50a3d2093523f793c0bc2210ec209e24683a4ddfc600500daac0c864aed2b04ef72e40dea1"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-6",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -120,7 +120,7 @@
     "ring_proof": "a8455660f642a887ca7bced683e7c5315c6ebff1d7d047ca43f5b5c7b34c244a3902f6ca62346b638ed58e4aa5b2c1c29107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddaedd504f70182cc453ab97bde517b23b46bb9f103b33d6ec16861808df31fe95363d99654ae24b13c76f86d822293ae19499785ff575aea311869ed993f48f495f4a206bab083a44433d44434f8af0d5b73b50d66f89cc1f70c1e6f3bbb6c7b48d87633025774bda01ca44d62be38a87db4af147959e4ee289f29237eaac674c4b7acc83c191daba160be6f1d5de39d858510f01336c0bda533a0b7e15ae38467b5db7d5dc1803b69d3a8284258b1d9b0a74019043484e5743cf82117c24237048da2b7c661b646b155d73cf9475b94089aea18aa12ffaa9489e45b5950eeb42ec1a9f5ba6440bcf31add7ffdbbaf6603403b1fb4f08171040a38c5c507f16032f013301d9d0a0fe82c0d300cf34e7147be19483f7be4967c876ac92809a14384c6fbbd68599144c9c87d7f9427a8f524a39f2af27e4e4a512974f75f2836528b7f464809288e9d2278f3f92e10e5fd06edd6ac37c2b73ee155ee7b53b5966e010f64d70fd96f07e31c134e1cc554c203fd306b56597003ec176ffd6291b3f67909cfa8021b55bda15810980a3d8ae138e3796940be4b9f768fbb22b2d3b5cadb1426734954948b980be84234362c5e9bfa05aa947a1f862bfc0fd77822b69f1a01aa71052f2d632548a4e3fe049ecbf4d0cf26212c95111a2243e4eceed64faeeb69106baa4127b8606c04f9d176886"
   },
   {
-    "comment": "bandersnatch_ed_sha512_ell2_ring_vectors - vector-7",
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_ietf_vectors.json b/data/vectors/bandersnatch_sw_sha512_tai_ietf.json
similarity index 91%
rename from data/vectors/bandersnatch_sw_sha512_tai_ietf_vectors.json
rename to data/vectors/bandersnatch_sw_sha512_tai_ietf.json
index 31e5aae..ddb1cf1 100644
--- a/data/vectors/bandersnatch_sw_sha512_tai_ietf_vectors.json
+++ b/data/vectors/bandersnatch_sw_sha512_tai_ietf.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-1",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
     "alpha": "",
@@ -13,7 +13,7 @@
     "proof_s": "5598a73c1298f425177eb560fa3cdccf80c54257c232164e07dac45c32df6003"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-2",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
     "alpha": "0a",
@@ -26,7 +26,7 @@
     "proof_s": "d35b8fb512fd5d2964c7f60d73127790f17f538f480c717b2ce93cd8c7b0cf11"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-3",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
     "alpha": "",
@@ -39,7 +39,7 @@
     "proof_s": "aad3e78c8a6b5eeb5daf6bb4656988e6d37f94a8bad9f7860eacafe914ddc801"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-4",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
     "alpha": "73616d706c65",
@@ -52,7 +52,7 @@
     "proof_s": "ad2e2a03a59302ff93e2e5da4f23e0bc4b930fb886a990a026a16e50a097df10"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-5",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -65,7 +65,7 @@
     "proof_s": "c50ba9c3fcce329970c73fad17d4fce0d81f44838bedafb9f7406ee4f712de1b"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-6",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -78,7 +78,7 @@
     "proof_s": "42cc993aedb2f7f0de1f769759ff5905763c8c73dd841b4ba6c67ca15bb0fb09"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ietf_vectors - vector-7",
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_pedersen_vectors.json b/data/vectors/bandersnatch_sw_sha512_tai_pedersen.json
similarity index 93%
rename from data/vectors/bandersnatch_sw_sha512_tai_pedersen_vectors.json
rename to data/vectors/bandersnatch_sw_sha512_tai_pedersen.json
index bd7e58a..b573a36 100644
--- a/data/vectors/bandersnatch_sw_sha512_tai_pedersen_vectors.json
+++ b/data/vectors/bandersnatch_sw_sha512_tai_pedersen.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-1",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
     "alpha": "",
@@ -17,7 +17,7 @@
     "proof_sb": "7811620463228a4d43764fefd1ff40d92bf80ccef6d2f3302e8f3e4c4055e00e"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-2",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
     "alpha": "0a",
@@ -34,7 +34,7 @@
     "proof_sb": "743d24f00b386e49090bc970778a030d75061d6c67c8bc030efab8f02c609f00"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-3",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
     "alpha": "",
@@ -51,7 +51,7 @@
     "proof_sb": "cbd729b414c65be509641a53ae18267fff50d1ac2fe6e777613973fd11068e10"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-4",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
     "alpha": "73616d706c65",
@@ -68,7 +68,7 @@
     "proof_sb": "bb9d2b63e1541beeaf74a45fdabf5e21c881cf3336b7df5d763b9cb45d839a17"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-5",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -85,7 +85,7 @@
     "proof_sb": "eda29f841d6b10bf022e8d3ab8fda97c5896940b5a3eaff42ea75cea411ece19"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-6",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -102,7 +102,7 @@
     "proof_sb": "8fd5408fa35ad60f55141bf9fa0bd2ad0c9d9bd18fd8468e1457749d5ef1c311"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_pedersen_vectors - vector-7",
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_ring_vectors.json b/data/vectors/bandersnatch_sw_sha512_tai_ring.json
similarity index 97%
rename from data/vectors/bandersnatch_sw_sha512_tai_ring_vectors.json
rename to data/vectors/bandersnatch_sw_sha512_tai_ring.json
index 7760ba4..9696748 100644
--- a/data/vectors/bandersnatch_sw_sha512_tai_ring_vectors.json
+++ b/data/vectors/bandersnatch_sw_sha512_tai_ring.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-1",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-1",
     "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
     "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
     "alpha": "",
@@ -20,7 +20,7 @@
     "ring_proof": "a641807aad87d0f6d689e3bcb2f2f6e6b1660e4a95729219a0da69d4a45d173930e7ae3077702e937186f4f1ef33df6e9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd9071a471c7fbd26eab907d5d92f9ab31bfc295b373c36c59c54aa17686d4250aa68407887374ad83f09e3d8662e827e980fc31da0c5d61f68fe634f92997c24cb443f9706b6befdc82b19114c711698c3356acf2d150296fdb889477e66869fbbbba695782a41bd0ac0814a65ef58f5f8a89ab005cf6bba46c44b110f3237431e4a2fe9071ca8bf1fb1a9fc9b0a6c926ec5d8f181900841d07c3008484d95c5b232401f1df8a84be744dc8ebebb6e811934d7721009db424a924eaa7f2523a56ca68fa2a6e4e76c681a5c8e16ab31682c04db1a3e663829926b5d1dd46f3f232000f323a7e3725ec5013eba2af30543491088f7220b2c616a089a0596cab8f141f5f7312aaa8ce9de9ec20c571f383b7a640f053736489b66b6a90c42ffb0c374bca4b2b63b8eed1467d32a12318b47685eb3b69f3f8f7886e86121241fb2d0d82a77b9d97bb2c9bd8d35e9925239fb79fcb0a9c69f85843f70352ad7cf759ad3f58c40eb555fd7186c39b26f3607aa0ad46fb04e25428bdf55569f3f191b15e07d81468002b78c33922b26c86c01972af25906661252c2bb4352179e68f253296bfe63ad6ed9d9c36b07980d75f1c43c1b2ab4e67939df123c483c907772b41a050dec6a10ff268be3366b2e9943b1e7017622c70560d19840f482d79b536d8df6911637ad55a008131a4d3ff07ab6c"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-2",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-2",
     "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
     "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
     "alpha": "0a",
@@ -40,7 +40,7 @@
     "ring_proof": "80c642a1a2bc671af70de73c14edc980acd0332f502eb6923e006210d481a01e69cee1b7575b184400c8b15952d59f169107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb1c8628c7bf3642725eb14cf555318a0381e83aefcc93521a070fcd73b7fde1049bec4816d54507adbcaa95fb24a0daeb3d5ec4abb9232ee806406c67cdf3ca2a6bf7dbc76f789f4b13f541827278c8a7c037f75254d8c9137c973c70ba64da3f83a4854e1d59dbd5329f5da022e5aaf3d54f8fc383a78f066fdca9ef3a80c21b3a534afc3fca209e5d8dea5b700598e46ef42f665d8644730b8e565dfc796512341136fb84f55c7a80421e0dbe7e6a8fa20eb4e05b81e2f25d21bae20844b4973edfdaf99a1f9458ff871a3e4481da1dd6b18cbfe56f5de85e6dec8a70d1417f7004164042a8b83b354c98b67c69cc0975cccd1ed4e9b431dd20e9f61dfee68399dc5625a1645a48023c1a56b86c9b02dc6593d9ab3f12469ffe42437e13a6d9f88826569b7140a97fd5052d17602f52836527a00115a9b536420a77296f90281049c9d894cd736b1cfbc447360b11cebb528dce54e0e1cd2886c8e32c4c3da57479965a349707add916515d0ed25e0f1c4d246ed321decbd446d15176bfeda58de757ae7f587274840f32c9eae0020a2511ccc5578c53ad2b5c107dac39b2ff27dbcc88c75726c281f6267ea1d61de6f9841067ecc04c70a5fb09b90ee29b484b61c95ae2da7d1bce39e61bacb234ea7596e052e7457c4e9267dd258bca7974e2ae6edc52a965564e66e443cecf502"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-3",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-3",
     "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
     "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
     "alpha": "",
@@ -60,7 +60,7 @@
     "ring_proof": "96ff1a58557e371bd7da544b5aeedbfa5754827b14e7072ba83de2208d2873720bb50ba97ed57f62c58ccd4c32757ab59107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb2bcf67ff96b55b999302b52dd8cf9e19ab3fb6ce4b3bbb15c0381e0cb1d68acb80e6692a9f94f5647d03a516da82c90a29831d0e0f883faade9512aa952a452f215e29cea0cf0ddebf45bf1a7b93ff33d022c0dc20c48d8756d85c26ed85b1df5720d3abaf8ba75e57aed509a510b463c37260d6278348113cb9ae34cdee84567e538a3b287133b6e88be0a552c0daa3a27c33e9bef4132b9b7cd0d0b407856de1fbc0f8d9843369bcabba9c5c4d4ec8c66239b7a27c5e71953c2d6d54f650cf845ad70f326786d44b767297f02df81ea2659b3e675bc57c9a23b42fe928241869fe79db9f3f48b447addd665b7b2321c63dc012957ec458fe26c8eb4c957017db439378b7037d4daa4709965d4e58fc9779257bb6d862f2f419bbc2f80972e78120ba392d0b20443aaaf1d6a2d723ab8cdeb798e30d0d00fd1a6952ebd2f308a19315776cd9c622a305a91e2ed690e4e5ff078d58ffb243ad55a28a55a0bc662684db198f91833abb7f1828ce28f0076839b12a5de94883cb545062f00cb40bde4f130bdeca6480b6b2ea1d66a1656ac10ff41d2047748f6384504e47658a30b6ad89b9c864c21806f5cb20853e720f596470fff43cdb7be2e7975fbd62bcca21aee42de8678f366b4922315c90ac3e085666a074625265a3e24c18edd1afe9199b325244d854decc7e944847d7ee6"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-4",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-4",
     "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
     "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
     "alpha": "73616d706c65",
@@ -80,7 +80,7 @@
     "ring_proof": "8706c5f4c8a67e18dfcdbef13dd19d746c418b98277c3b59aea04e81ea7f5dc8454b09989582ca995d6b287a6c2963279107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd9192c39e55c27b63b7f8dac81dc54f73ac7e2961711eef7c9af17859cae015398a681206f0e11322bb095b460528394b8521d9b731e36aa8631ddb4e91a8df3c44b832359d27cdf9fceacc651d094026fd402984668ac3eaaaeabda585b66173f7bcb25aa205ea0feb9d1b670935c07188f6497f4479cb039498d114dcaf3c734504f8525001a27cd262061105fd33c1ea679d38528d02407845b8af55ff5c5f0a0c761bf9fc25c4df20e70bf83d2b4a0e9fba2c953952845b28ee0f4e5e7672a54e39d45a2957132e0bc915b880673287250a19413f692f58a8a5536362354b2a63e4391bf06916106da2f371961f5219e8e41cf600122b73bed37a60253b44755f49f067a952aa0372e768ea2f4d414ab52a3ee7c3240280b0578c8359e87126a214683823b828a7effa1f5d816862d76d8e994f7905289c50983794f4e76d85ce03e81218f9d0b05b62240445515abe06cec0b089757f0da885ec442adfabd3fe007a939ae374286e738a9ecf076648073161a8445cd9984c993cafa32649fd4632e408cfc1895d3ae94664f8c861ac52583200e4197ae74ae3760197c9500e4c48300afad0870e9849aaffef56cdddb817c7d8cd9ff618fc7e24903d2218882279493c6dbc6df5ac3b235fa304b54f53e18173ae84a88028d1085ab4259c340ce12102e239c230e57b94420f8d6d"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-5",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-5",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -100,7 +100,7 @@
     "ring_proof": "85ce565be999865c61c89eab6c443d7a4f5a424e95dc8bc7fa5219d1124ac8387bf4205bc0cac12683287d8289a230dd9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd99f434882e1915f4a05de2341df629b12b434950af00e8993f44f7e626b750662398039ecf28fff1e2af01e38a4a1ef8967cca90a94e123eebb04994ae2640fe05da2230fd900dc2f772f840af9022c5edda744696793ea5b5176d9cef19f04d3a47b715926c6bb06035f8d069fdd0a735439050ccce31a70c0bc3e850b7e43d5734bd0b857afed39e4ffafdb7109a960cce6cbc3c01396a81c5ebf0fc13526dbfcc32aac952a47d06e6311b90307bf91ef2b528568520a56e81fd7240382f03080c9e0f60301077ec41f18e9ec21f44f631362450430de55a79e480f62c5d1dae47d83b793eefb6644d90fcf21a53b559d63f3d7c8eb44739a249fa8904572f520b70c3fe5d93f95f6cfa05de00c36ee6f34918b977a761ab06d55c77750268e603f35fd4edf5f930ef684fe4b6883a544317701b1a9c1004451ec4dc70dc2f8cefd392646ce1a54b21cd5c2ee7e1bd2fe772745e56abeb46f354e15359b4aea1e8f20f89aed95f8a1914fafdb53db5699bc6e67f88d1a0f21b40f3b35022eff95a1be50da75dc19febaf21f3987128961cefca533a54f9ba8472aedfa78dac7a652618521d7608f2b26901c0729d0109b21b0a02dc45a4212841319a2937a3a0b36e8ddfb22118c34781566e0677607644090cf52bcbdd8e3a08e7aba65bce76a5c00feec457a6a95950184308ce6d"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-6",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-6",
     "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
     "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -120,7 +120,7 @@
     "ring_proof": "b2ff083e9be8cbb73aa5476ec9fb9c2bea4bd012d92b14bac79755be01c22d09a1819871b64b85c4bf295b774adcf2b09107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd8fe4b6ff4e8e30feaeff3d700b6a375889be79626bfb319abd1de3a73d00ab42c2913e5003a6715a12d509d6b6e43235b0bf81f8c478fee03831211d8eefe1fc29e2082cafa7abcfcad386a2abebf6aec4e8c5e10e1e19146679176aa42bad3b5915ef164af554bd49477e15c5aca28bb441c9b7f7c3c62dca4f6d8cdce975411766f2d6b0cbd198fae4b777ad2f0b390c28bd27949ccc1eaf6542f351847334723bb184b6d46d4bfe1639dee1a3284c1abfde9daaf310dc744ebd39635fdd6eda587f61759f8837d3dd4cc5433c365e18472ceaa24e2a41b38125a8004789723399b3032ef25a19c68be9c8e4f65a86960a93956349d00e46cc84e211bffe2dd09262329a9359319d1a5686bf4f57c9ea1073a83d7157d4c9064fb934d1c745b8be9d091f6ec7be34f437d69ac6fce05945799871edd031bbfe01c95acb4d2686cb78bfb9b015fc79cb0ab38bca136e46e31f1832fbeeabc35f243285ce8b0747c45ee8034a255a28f05b14f5462ec98c6b4c3ac01c381c853396fc95eebe8fe82201242158d7a38defc3a550f04b3db8d060e2f11aca8bf4c262926c4c5ff42e5c4ffe132c9c133473f3b6acc6de5840150526508cc8a1aba0d66b728be0668ffbbdc27052f1b1940a7e3499e4f073be139cf15ac553b930383e114c69f2797cec36ef0dfcf6f0b2c9fb757ef9e5aa"
   },
   {
-    "comment": "bandersnatch_sw_sha512_tai_ring_vectors - vector-7",
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-7",
     "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
     "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/ed25519_sha512_tai_ietf_vectors.json b/data/vectors/ed25519_sha512_tai_ietf.json
similarity index 91%
rename from data/vectors/ed25519_sha512_tai_ietf_vectors.json
rename to data/vectors/ed25519_sha512_tai_ietf.json
index d61bb42..3cd9a7e 100644
--- a/data/vectors/ed25519_sha512_tai_ietf_vectors.json
+++ b/data/vectors/ed25519_sha512_tai_ietf.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-1",
+    "comment": "ed25519_sha512_tai_ietf - vector-1",
     "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
     "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
     "alpha": "",
@@ -13,7 +13,7 @@
     "proof_s": "f6e5185341262ea10d5d8b2bd8325099e690941c82f8be67d981c3da4ac27a01"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-2",
+    "comment": "ed25519_sha512_tai_ietf - vector-2",
     "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
     "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
     "alpha": "0a",
@@ -26,7 +26,7 @@
     "proof_s": "6861d92d783add90383ee376a32550facc645fcf5af8b6c1986f86eaa3d7d806"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-3",
+    "comment": "ed25519_sha512_tai_ietf - vector-3",
     "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
     "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
     "alpha": "",
@@ -39,7 +39,7 @@
     "proof_s": "af2ffa762dd13e7519d4a0b06145099a83a2ad163457eda34c189b3e4aa40805"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-4",
+    "comment": "ed25519_sha512_tai_ietf - vector-4",
     "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
     "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
     "alpha": "73616d706c65",
@@ -52,7 +52,7 @@
     "proof_s": "9c90820cc75ce12d26ea07eb8b9d9207cc72976056f96c2bf6cac3756818060e"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-5",
+    "comment": "ed25519_sha512_tai_ietf - vector-5",
     "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
     "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -65,7 +65,7 @@
     "proof_s": "34c96762240d57b5e81e1f3be085c3076de91b12f4489a5fb22c3a56cda20006"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-6",
+    "comment": "ed25519_sha512_tai_ietf - vector-6",
     "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
     "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -78,7 +78,7 @@
     "proof_s": "da87b9116b84d5678fceeefb252337fd8a8dbd23edfc3d5e9971842463cd9302"
   },
   {
-    "comment": "ed25519_sha512_tai_ietf_vectors - vector-7",
+    "comment": "ed25519_sha512_tai_ietf - vector-7",
     "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
     "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/ed25519_sha512_tai_pedersen_vectors.json b/data/vectors/ed25519_sha512_tai_pedersen.json
similarity index 94%
rename from data/vectors/ed25519_sha512_tai_pedersen_vectors.json
rename to data/vectors/ed25519_sha512_tai_pedersen.json
index 80b0091..d0d6b2b 100644
--- a/data/vectors/ed25519_sha512_tai_pedersen_vectors.json
+++ b/data/vectors/ed25519_sha512_tai_pedersen.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-1",
+    "comment": "ed25519_sha512_tai_pedersen - vector-1",
     "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
     "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
     "alpha": "",
@@ -17,7 +17,7 @@
     "proof_sb": "664f8fe78b0690bb286fa207ff4489cb65c95067d18cd1226695671ecfdb570c"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-2",
+    "comment": "ed25519_sha512_tai_pedersen - vector-2",
     "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
     "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
     "alpha": "0a",
@@ -34,7 +34,7 @@
     "proof_sb": "99dea8a87b03c39f1f3d7e014bb20f2922602bbaa727306b5637ae35113e000a"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-3",
+    "comment": "ed25519_sha512_tai_pedersen - vector-3",
     "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
     "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
     "alpha": "",
@@ -51,7 +51,7 @@
     "proof_sb": "eb67fc2427b74292104e5b879e3f8bdcd8a496c4a3780b469c05d71ea0d0c10f"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-4",
+    "comment": "ed25519_sha512_tai_pedersen - vector-4",
     "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
     "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
     "alpha": "73616d706c65",
@@ -68,7 +68,7 @@
     "proof_sb": "bb8386be8878dde1dddb24067aee275ce47537d14c7ac7c42c1f69811ce9810f"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-5",
+    "comment": "ed25519_sha512_tai_pedersen - vector-5",
     "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
     "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -85,7 +85,7 @@
     "proof_sb": "3f93d063b8beb51148776d243727aca320b59fcf6d424b0976cabc741f39700e"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-6",
+    "comment": "ed25519_sha512_tai_pedersen - vector-6",
     "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
     "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -102,7 +102,7 @@
     "proof_sb": "b547f9b6803ac9c1cfd069ee0feaa22143a025b98095669b6e6fd598b62a7806"
   },
   {
-    "comment": "ed25519_sha512_tai_pedersen_vectors - vector-7",
+    "comment": "ed25519_sha512_tai_pedersen - vector-7",
     "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
     "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/secp256_sha256_tai_ietf_vectors.json b/data/vectors/secp256_sha256_tai_ietf.json
similarity index 90%
rename from data/vectors/secp256_sha256_tai_ietf_vectors.json
rename to data/vectors/secp256_sha256_tai_ietf.json
index d04d93f..88b329a 100644
--- a/data/vectors/secp256_sha256_tai_ietf_vectors.json
+++ b/data/vectors/secp256_sha256_tai_ietf.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-1",
+    "comment": "secp256_sha256_tai_ietf - vector-1",
     "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
     "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
     "alpha": "",
@@ -13,7 +13,7 @@
     "proof_s": "18da92d89d92aae8f418ed54eaa7495f5e04cc8835bcfff2210ae6c1b9bf753e"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-2",
+    "comment": "secp256_sha256_tai_ietf - vector-2",
     "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
     "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
     "alpha": "0a",
@@ -26,7 +26,7 @@
     "proof_s": "3060920a0e67c660f459e0bab6f3f71e865aae07296eb114434072f95210bdc4"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-3",
+    "comment": "secp256_sha256_tai_ietf - vector-3",
     "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
     "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
     "alpha": "",
@@ -39,7 +39,7 @@
     "proof_s": "3f9e45b6a85f0e77fd57697c1eb92d00088d84226bc717945e2fb9e45f86da84"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-4",
+    "comment": "secp256_sha256_tai_ietf - vector-4",
     "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
     "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
     "alpha": "73616d706c65",
@@ -52,7 +52,7 @@
     "proof_s": "77cdda834d27790d337f1fc6ff81d794fb399ed3bd98ab5b28f10d9a8383d568"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-5",
+    "comment": "secp256_sha256_tai_ietf - vector-5",
     "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
     "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -65,7 +65,7 @@
     "proof_s": "fe9838493a71efff78d4f1d406fccb3e874eeb39b4e901b773ddfcab85050f94"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-6",
+    "comment": "secp256_sha256_tai_ietf - vector-6",
     "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
     "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -78,7 +78,7 @@
     "proof_s": "098191c8fe8b2c814fc83e9570b1811916492312e7488b5d1cdac6d5f5c8b781"
   },
   {
-    "comment": "secp256_sha256_tai_ietf_vectors - vector-7",
+    "comment": "secp256_sha256_tai_ietf - vector-7",
     "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
     "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/data/vectors/secp256r1_sha256_tai_pedersen_vectors.json b/data/vectors/secp256r1_sha256_tai_pedersen.json
similarity index 93%
rename from data/vectors/secp256r1_sha256_tai_pedersen_vectors.json
rename to data/vectors/secp256r1_sha256_tai_pedersen.json
index b73da62..7bf9f49 100644
--- a/data/vectors/secp256r1_sha256_tai_pedersen_vectors.json
+++ b/data/vectors/secp256r1_sha256_tai_pedersen.json
@@ -1,6 +1,6 @@
 [
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-1",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-1",
     "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
     "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
     "alpha": "",
@@ -17,7 +17,7 @@
     "proof_sb": "23c6eff5cf3689b0b8b7147e5a13de16dbd7f1acaff04032a35e44c52ea023dc"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-2",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-2",
     "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
     "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
     "alpha": "0a",
@@ -34,7 +34,7 @@
     "proof_sb": "2f1c27c991510bb11ebaddb3a65ec3294ea32af26fce184fa5561cbb1e9b5f48"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-3",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-3",
     "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
     "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
     "alpha": "",
@@ -51,7 +51,7 @@
     "proof_sb": "1610b08673f5a1bcaeb74c81481b36edb8af018fb450437bf2dc11a0492c4f0f"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-4",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-4",
     "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
     "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
     "alpha": "73616d706c65",
@@ -68,7 +68,7 @@
     "proof_sb": "1c02800a1f2b370e2938d9e240e9a4a786246db117d442a52ff03e81bcdd1c14"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-5",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-5",
     "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
     "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -85,7 +85,7 @@
     "proof_sb": "5c0df912869933c5b9be4e32c326f8b048bd3333f8e4f8cf8ff0d2a73d47e3b3"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-6",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-6",
     "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
     "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
     "alpha": "42616e646572736e6174636820766563746f72",
@@ -102,7 +102,7 @@
     "proof_sb": "bc122a64fbaebe574bf370ae8debb155ef97bc7999af84af1c8014b209c22552"
   },
   {
-    "comment": "secp256r1_sha256_tai_pedersen_vectors - vector-7",
+    "comment": "secp256r1_sha256_tai_pedersen - vector-7",
     "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
     "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
     "alpha": "42616e646572736e6174636820766563746f72",
diff --git a/src/suites/bandersnatch.rs b/src/suites/bandersnatch.rs
index 6735c86..8e7ff32 100644
--- a/src/suites/bandersnatch.rs
+++ b/src/suites/bandersnatch.rs
@@ -257,7 +257,7 @@ mod test_vectors_ietf_ed {
     use crate::testing;
 
     type V = crate::ietf::testing::TestVector<BandersnatchSha512Ell2>;
-    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ietf_vectors";
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -277,7 +277,7 @@ mod test_vectors_pedersen_ed {
     use crate::testing;
 
     type V = crate::pedersen::testing::TestVector<BandersnatchSha512Ell2>;
-    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_pedersen_vectors";
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -297,7 +297,7 @@ mod test_vectors_ring_ed {
     use crate::testing;
 
     type V = crate::ring::testing::TestVector<BandersnatchSha512Ell2>;
-    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ring_vectors";
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ring";
 
     impl crate::ring::testing::RingSuiteExt for BandersnatchSha512Ell2 {
         fn ring_context() -> &'static RingContext {
@@ -334,7 +334,7 @@ mod test_vectors_ietf_sw {
     use crate::testing;
 
     type V = crate::ietf::testing::TestVector<BandersnatchSha512Tai>;
-    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ietf_vectors";
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -354,7 +354,7 @@ mod test_vectors_pedersen_sw {
     use crate::testing;
 
     type V = crate::pedersen::testing::TestVector<BandersnatchSha512Tai>;
-    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_pedersen_vectors";
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -374,7 +374,7 @@ mod test_vectors_ring_sw {
     use crate::testing;
 
     type V = crate::ring::testing::TestVector<BandersnatchSha512Tai>;
-    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ring_vectors";
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ring";
 
     impl crate::ring::testing::RingSuiteExt for BandersnatchSha512Tai {
         fn ring_context() -> &'static RingContext {
diff --git a/src/suites/ed25519.rs b/src/suites/ed25519.rs
index f394525..1416528 100644
--- a/src/suites/ed25519.rs
+++ b/src/suites/ed25519.rs
@@ -82,7 +82,7 @@ mod test_vectors_ietf {
     use super::*;
 
     type V = crate::ietf::testing::TestVector<Ed25519Sha512Tai>;
-    const VECTOR_ID: &str = "ed25519_sha512_tai_ietf_vectors";
+    const VECTOR_ID: &str = "ed25519_sha512_tai_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -101,7 +101,7 @@ mod test_vectors_pedersen {
     use super::*;
 
     type V = crate::pedersen::testing::TestVector<Ed25519Sha512Tai>;
-    const VECTOR_ID: &str = "ed25519_sha512_tai_pedersen_vectors";
+    const VECTOR_ID: &str = "ed25519_sha512_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
diff --git a/src/suites/secp256.rs b/src/suites/secp256.rs
index 2edc7b6..5e53040 100644
--- a/src/suites/secp256.rs
+++ b/src/suites/secp256.rs
@@ -91,9 +91,9 @@ mod test_vectors_ietf {
     use super::*;
 
     type V = crate::ietf::testing::TestVector<P256Sha256Tai>;
-    const VECTOR_ID: &str = "secp256_sha256_tai_ietf_vectors";
+    const VECTOR_ID: &str = "secp256_sha256_tai_ietf";
     // Vectors from RFC-9381
-    const VECTOR_ID_RFC_9381: &str = "secp256_sha256_tai_ietf_vectors_rfc_9381";
+    const VECTOR_ID_RFC_9381: &str = "secp256_sha256_tai_ietf_rfc_9381";
 
     #[test]
     #[ignore = "test vectors generator"]
@@ -117,7 +117,7 @@ mod test_vectors_pedersen {
     use super::*;
 
     type V = crate::pedersen::testing::TestVector<P256Sha256Tai>;
-    const VECTOR_ID: &str = "secp256r1_sha256_tai_pedersen_vectors";
+    const VECTOR_ID: &str = "secp256r1_sha256_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]