diff --git a/crypto3/libs/benchmark_tools/include/nil/crypto3/bench/benchmark.hpp b/crypto3/libs/benchmark_tools/include/nil/crypto3/bench/benchmark.hpp
index e55f94c650..298d256676 100644
--- a/crypto3/libs/benchmark_tools/include/nil/crypto3/bench/benchmark.hpp
+++ b/crypto3/libs/benchmark_tools/include/nil/crypto3/bench/benchmark.hpp
@@ -202,11 +202,10 @@ void run_benchmark(std::string const& name, F && func)
             unit = "??";
     }
 
-    std::cout << std::fixed << std::setprecision(3);
-    std::cout << name <<
-        " mean: " << mean << unit << " err: " << (MdAPE*100) <<
-        "% median: " << median << unit << " stddiv: " << stddiv <<
-        std::endl;
+    std::cout << std::fixed << std::setprecision(3) << std::setfill(' ');
+    std::cout << name << " mean: " << std::setw(7) << mean << unit
+              << " err: " << std::setw(7) << (MdAPE * 100) << "% median: " << std::setw(7)
+              << median << unit << " stddiv: " << std::setw(7) << stddiv << std::endl;
 }
 
         }
diff --git a/crypto3/libs/multiprecision/test/big_mod_randomized.cpp b/crypto3/libs/multiprecision/test/big_mod_randomized.cpp
index e8dc6fcb95..5edac37006 100644
--- a/crypto3/libs/multiprecision/test/big_mod_randomized.cpp
+++ b/crypto3/libs/multiprecision/test/big_mod_randomized.cpp
@@ -143,14 +143,15 @@ BOOST_DATA_TEST_CASE(
 
 // This one tests 64-bit numbers used in Goldilock fields.
 BOOST_DATA_TEST_CASE(
-    goldilock_montgomery,
-    (test_dataset<ModularArithmeticSample<montgomery_big_mod_rt<64>>>("goldilock"))) {
+    goldilocks_montgomery,
+    (test_dataset<ModularArithmeticSample<montgomery_big_mod_rt<64>>>("goldilocks"))) {
     base_operations_test(sample);
 }
 
 BOOST_DATA_TEST_CASE(
-    goldilock, (test_dataset<ModularArithmeticSample<goldilocks_mod, /*fixed_mod=*/true>>(
-                   "goldilock"))) {
+    goldilocks,
+    (test_dataset<ModularArithmeticSample<goldilocks_mod, /*fixed_mod=*/true>>(
+        "goldilocks"))) {
     base_operations_test(sample);
 }
 
diff --git a/crypto3/libs/multiprecision/test/data/big_mod_randomized.json b/crypto3/libs/multiprecision/test/data/big_mod_randomized.json
index acbf386d3f..bb00610841 100644
--- a/crypto3/libs/multiprecision/test/data/big_mod_randomized.json
+++ b/crypto3/libs/multiprecision/test/data/big_mod_randomized.json
@@ -4003,7 +4003,7 @@
             "a_m_pow_b": "0x212803e8406c4c24a3acfea6165154ecf"
         }
     ],
-    "goldilock": [
+    "goldilocks": [
         {
             "a": "0x112d6",
             "b": "0x2200d2870b",
diff --git a/crypto3/libs/multiprecision/test/data/generate_test_data.py b/crypto3/libs/multiprecision/test/data/generate_test_data.py
index 4f8a15b847..07b80f0aa3 100644
--- a/crypto3/libs/multiprecision/test/data/generate_test_data.py
+++ b/crypto3/libs/multiprecision/test/data/generate_test_data.py
@@ -119,7 +119,7 @@ def gen_arg(bits, m, rnd):
     params = [
         ["prime_mod_montgomery_130", 0x314107B9EF725F87FA08F9FDADD4F48BB, 130],
         ["even_mod_130", 0x314107B9EF725F87FA08F9FDADD4F48BA, 130],
-        ["goldilock", 0xFFFFFFFF00000001, 64],
+        ["goldilocks", 0xFFFFFFFF00000001, 64],
         ["even_mod_17", 0x1E240, 17],
         ["montgomery_17", 0x1E241, 17],
     ]