[libc-commits] [libc] [libc][math][NFC] Fix duplicated class names in math tests. (PR #224666)

via libc-commits libc-commits at lists.llvm.org
Fri Sep 18 07:52:40 PDT 2026


https://github.com/lntue created https://github.com/llvm/llvm-project/pull/224666

This might cause ODR issues when we put all the tests together into a single test.

>From 6cb23c37658ce6e8eaf200017c54e40a26f39bfa Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Fri, 18 Sep 2026 14:49:48 +0000
Subject: [PATCH] [libc][math][NFC] Fix duplicated class names in math tests.

---
 libc/test/src/math/AddTest.h                  | 10 +++---
 libc/test/src/math/CeilTest.h                 |  6 ++--
 libc/test/src/math/CopySignTest.h             |  8 ++---
 libc/test/src/math/DivTest.h                  | 10 +++---
 libc/test/src/math/FAbsTest.h                 |  8 ++---
 libc/test/src/math/FMaxTest.h                 | 14 ++++----
 libc/test/src/math/FMinTest.h                 | 14 ++++----
 libc/test/src/math/FModTest.h                 |  8 ++---
 libc/test/src/math/FloorTest.h                |  6 ++--
 libc/test/src/math/FmaTest.h                  | 20 ++++++-----
 libc/test/src/math/FrexpTest.h                | 12 +++----
 libc/test/src/math/LdExpTest.h                | 16 ++++-----
 libc/test/src/math/LogbTest.h                 | 12 +++----
 libc/test/src/math/ModfTest.h                 | 12 +++----
 libc/test/src/math/MulTest.h                  | 10 +++---
 libc/test/src/math/NearbyIntTest.h            | 12 +++----
 libc/test/src/math/NextAfterTest.h            |  8 ++---
 libc/test/src/math/RIntTest.h                 | 14 ++++----
 libc/test/src/math/RemQuoTest.h               | 12 +++----
 libc/test/src/math/RoundEvenTest.h            | 12 +++----
 libc/test/src/math/RoundTest.h                |  6 ++--
 libc/test/src/math/RoundToIntegerTest.h       | 30 +++++++---------
 libc/test/src/math/RsqrtTest.h                | 20 ++++++-----
 libc/test/src/math/ScalbnTest.h               | 16 ++++-----
 libc/test/src/math/SqrtTest.h                 | 20 ++++++-----
 libc/test/src/math/SubTest.h                  | 10 +++---
 libc/test/src/math/TruncTest.h                |  6 ++--
 libc/test/src/math/bf16add_test.cpp           |  2 +-
 libc/test/src/math/bf16addf128_test.cpp       |  2 +-
 libc/test/src/math/bf16addf_test.cpp          |  2 +-
 libc/test/src/math/bf16addl_test.cpp          |  2 +-
 libc/test/src/math/bf16div_test.cpp           |  2 +-
 libc/test/src/math/bf16divf128_test.cpp       |  2 +-
 libc/test/src/math/bf16divf_test.cpp          |  2 +-
 libc/test/src/math/bf16divl_test.cpp          |  2 +-
 libc/test/src/math/bf16fma_test.cpp           |  2 +-
 libc/test/src/math/bf16fmaf128_test.cpp       |  3 +-
 libc/test/src/math/bf16fmaf_test.cpp          |  2 +-
 libc/test/src/math/bf16fmal_test.cpp          |  3 +-
 libc/test/src/math/bf16mul_test.cpp           |  2 +-
 libc/test/src/math/bf16mulf128_test.cpp       |  2 +-
 libc/test/src/math/bf16mulf_test.cpp          |  2 +-
 libc/test/src/math/bf16mull_test.cpp          |  2 +-
 libc/test/src/math/bf16sub_test.cpp           |  2 +-
 libc/test/src/math/bf16subf128_test.cpp       |  2 +-
 libc/test/src/math/bf16subf_test.cpp          |  2 +-
 libc/test/src/math/bf16subl_test.cpp          |  2 +-
 libc/test/src/math/ceil_test.cpp              |  2 +-
 libc/test/src/math/ceilbf16_test.cpp          |  2 +-
 libc/test/src/math/ceilf128_test.cpp          |  2 +-
 libc/test/src/math/ceilf16_test.cpp           |  2 +-
 libc/test/src/math/ceilf_test.cpp             |  2 +-
 libc/test/src/math/ceill_test.cpp             |  2 +-
 libc/test/src/math/copysign_test.cpp          |  2 +-
 libc/test/src/math/copysignf_test.cpp         |  2 +-
 libc/test/src/math/copysignl_test.cpp         |  2 +-
 libc/test/src/math/daddl_test.cpp             |  2 +-
 libc/test/src/math/ddivl_test.cpp             |  2 +-
 libc/test/src/math/dfmal_test.cpp             |  2 +-
 libc/test/src/math/dmull_test.cpp             |  2 +-
 libc/test/src/math/dsqrtl_test.cpp            |  2 +-
 libc/test/src/math/dsubl_test.cpp             |  2 +-
 .../test/src/math/exhaustive/acospif_test.cpp |  6 ++--
 .../src/math/exhaustive/cosf_float_test.cpp   |  6 ++--
 .../src/math/exhaustive/fmodbf16_test.cpp     | 10 +++---
 .../test/src/math/exhaustive/lgammaf_test.cpp |  2 --
 libc/test/src/math/exhaustive/rsqrtf_test.cpp |  2 --
 .../src/math/exhaustive/sinf_float_test.cpp   |  6 ++--
 libc/test/src/math/f16add_test.cpp            |  2 +-
 libc/test/src/math/f16addf_test.cpp           |  2 +-
 libc/test/src/math/f16addl_test.cpp           |  2 +-
 libc/test/src/math/f16div_test.cpp            |  2 +-
 libc/test/src/math/f16divf_test.cpp           |  2 +-
 libc/test/src/math/f16divl_test.cpp           |  2 +-
 libc/test/src/math/f16fma_test.cpp            |  2 +-
 libc/test/src/math/f16fmaf_test.cpp           |  2 +-
 libc/test/src/math/f16fmal_test.cpp           |  2 +-
 libc/test/src/math/f16mul_test.cpp            |  2 +-
 libc/test/src/math/f16mulf_test.cpp           |  2 +-
 libc/test/src/math/f16mull_test.cpp           |  2 +-
 libc/test/src/math/f16sqrt_test.cpp           |  2 +-
 libc/test/src/math/f16sqrtf_test.cpp          |  2 +-
 libc/test/src/math/f16sqrtl_test.cpp          |  3 +-
 libc/test/src/math/f16sub_test.cpp            |  2 +-
 libc/test/src/math/f16subf_test.cpp           |  2 +-
 libc/test/src/math/f16subl_test.cpp           |  2 +-
 libc/test/src/math/fabs_test.cpp              |  2 +-
 libc/test/src/math/fabsbf16_test.cpp          |  2 +-
 libc/test/src/math/fabsf16_test.cpp           |  2 +-
 libc/test/src/math/fabsf_test.cpp             |  2 +-
 libc/test/src/math/fabsl_test.cpp             |  2 +-
 libc/test/src/math/fadd_test.cpp              |  2 +-
 libc/test/src/math/faddl_test.cpp             |  2 +-
 libc/test/src/math/fdim_test.cpp              | 12 +++----
 libc/test/src/math/fdimf_test.cpp             | 14 ++++----
 libc/test/src/math/fdiml_test.cpp             | 14 ++++----
 libc/test/src/math/fdiv_test.cpp              |  2 +-
 libc/test/src/math/fdivl_test.cpp             |  2 +-
 libc/test/src/math/ffma_test.cpp              |  2 +-
 libc/test/src/math/ffmal_test.cpp             |  2 +-
 libc/test/src/math/floor_test.cpp             |  2 +-
 libc/test/src/math/floorbf16_test.cpp         |  2 +-
 libc/test/src/math/floorf128_test.cpp         |  2 +-
 libc/test/src/math/floorf16_test.cpp          |  2 +-
 libc/test/src/math/floorf_test.cpp            |  2 +-
 libc/test/src/math/floorl_test.cpp            |  2 +-
 libc/test/src/math/fmaf16_test.cpp            |  2 +-
 libc/test/src/math/fmaf_test.cpp              |  2 +-
 libc/test/src/math/fmax_test.cpp              |  2 +-
 libc/test/src/math/fmaxf_test.cpp             |  2 +-
 libc/test/src/math/fmaxl_test.cpp             |  2 +-
 libc/test/src/math/fmin_test.cpp              |  2 +-
 libc/test/src/math/fminf_test.cpp             |  2 +-
 libc/test/src/math/fminl_test.cpp             |  2 +-
 libc/test/src/math/fmod_test.cpp              |  2 +-
 libc/test/src/math/fmodf_test.cpp             |  2 +-
 libc/test/src/math/fmul_test.cpp              |  4 +--
 libc/test/src/math/fmull_test.cpp             |  2 +-
 libc/test/src/math/frexp_test.cpp             |  2 +-
 libc/test/src/math/frexpbf16_test.cpp         |  2 +-
 libc/test/src/math/frexpf16_test.cpp          |  2 +-
 libc/test/src/math/frexpf_test.cpp            |  2 +-
 libc/test/src/math/frexpl_test.cpp            |  2 +-
 libc/test/src/math/fsqrt_test.cpp             |  2 +-
 libc/test/src/math/fsqrtl_test.cpp            |  2 +-
 libc/test/src/math/fsub_test.cpp              |  2 +-
 libc/test/src/math/fsubl_test.cpp             |  2 +-
 libc/test/src/math/generic_sqrt_test.cpp      |  2 +-
 libc/test/src/math/generic_sqrtf_test.cpp     |  2 +-
 libc/test/src/math/generic_sqrtl_test.cpp     |  3 +-
 libc/test/src/math/ldexp_test.cpp             |  2 +-
 libc/test/src/math/ldexpf_test.cpp            |  2 +-
 libc/test/src/math/ldexpl_test.cpp            |  2 +-
 libc/test/src/math/llrint_test.cpp            |  2 +-
 libc/test/src/math/llrintbf16_test.cpp        |  2 +-
 libc/test/src/math/llrintf16_test.cpp         |  2 +-
 libc/test/src/math/llrintf_test.cpp           |  2 +-
 libc/test/src/math/llrintl_test.cpp           |  2 +-
 libc/test/src/math/llround_test.cpp           |  2 +-
 libc/test/src/math/llroundbf16_test.cpp       |  3 +-
 libc/test/src/math/llroundf16_test.cpp        |  3 +-
 libc/test/src/math/llroundf_test.cpp          |  3 +-
 libc/test/src/math/llroundl_test.cpp          |  3 +-
 libc/test/src/math/logb_test.cpp              |  2 +-
 libc/test/src/math/logbf_test.cpp             |  2 +-
 libc/test/src/math/logbl_test.cpp             |  2 +-
 libc/test/src/math/lrint_test.cpp             |  3 +-
 libc/test/src/math/lrintbf16_test.cpp         |  2 +-
 libc/test/src/math/lrintf16_test.cpp          |  3 +-
 libc/test/src/math/lrintf_test.cpp            |  3 +-
 libc/test/src/math/lrintl_test.cpp            |  2 +-
 libc/test/src/math/lround_test.cpp            |  2 +-
 libc/test/src/math/lroundbf16_test.cpp        |  3 +-
 libc/test/src/math/lroundf16_test.cpp         |  2 +-
 libc/test/src/math/lroundf_test.cpp           |  2 +-
 libc/test/src/math/lroundl_test.cpp           |  2 +-
 libc/test/src/math/modf_test.cpp              |  2 +-
 libc/test/src/math/modff_test.cpp             |  2 +-
 libc/test/src/math/modfl_test.cpp             |  2 +-
 libc/test/src/math/nearbyint_test.cpp         |  2 +-
 libc/test/src/math/nearbyintbf16_test.cpp     |  2 +-
 libc/test/src/math/nearbyintf16_test.cpp      |  2 +-
 libc/test/src/math/nearbyintf_test.cpp        |  2 +-
 libc/test/src/math/nearbyintl_test.cpp        |  2 +-
 libc/test/src/math/nextafter_test.cpp         |  2 +-
 libc/test/src/math/nextafterf128_test.cpp     |  2 +-
 libc/test/src/math/nextafterf_test.cpp        |  2 +-
 libc/test/src/math/nextafterl_test.cpp        |  2 +-
 libc/test/src/math/remquo_test.cpp            |  2 +-
 libc/test/src/math/remquobf16_test.cpp        |  2 +-
 libc/test/src/math/remquof16_test.cpp         |  2 +-
 libc/test/src/math/remquof_test.cpp           |  2 +-
 libc/test/src/math/remquol_test.cpp           |  2 +-
 libc/test/src/math/rint_test.cpp              |  2 +-
 libc/test/src/math/rintbf16_test.cpp          |  2 +-
 libc/test/src/math/rintf16_test.cpp           |  2 +-
 libc/test/src/math/rintf_test.cpp             |  2 +-
 libc/test/src/math/rintl_test.cpp             |  2 +-
 libc/test/src/math/round_test.cpp             |  2 +-
 libc/test/src/math/roundbf16_test.cpp         |  2 +-
 libc/test/src/math/roundeven_test.cpp         |  2 +-
 libc/test/src/math/roundevenbf16_test.cpp     |  2 +-
 libc/test/src/math/roundevenf16_test.cpp      |  2 +-
 libc/test/src/math/roundevenf_test.cpp        |  2 +-
 libc/test/src/math/roundevenl_test.cpp        |  2 +-
 libc/test/src/math/roundf128_test.cpp         |  2 +-
 libc/test/src/math/roundf16_test.cpp          |  2 +-
 libc/test/src/math/roundf_test.cpp            |  2 +-
 libc/test/src/math/roundl_test.cpp            |  2 +-
 libc/test/src/math/rsqrtf_test.cpp            |  2 +-
 libc/test/src/math/scalbn_test.cpp            |  2 +-
 libc/test/src/math/scalbnf128_test.cpp        |  2 +-
 libc/test/src/math/scalbnf_test.cpp           |  2 +-
 libc/test/src/math/scalbnl_test.cpp           |  2 +-
 libc/test/src/math/smoke/AddTest.h            | 26 +++++++++-----
 libc/test/src/math/smoke/CMakeLists.txt       |  6 ++--
 libc/test/src/math/smoke/CanonicalizeTest.h   | 20 +++++------
 libc/test/src/math/smoke/CeilTest.h           | 10 +++---
 libc/test/src/math/smoke/CopySignTest.h       |  8 ++---
 libc/test/src/math/smoke/DivTest.h            | 18 ++++++----
 libc/test/src/math/smoke/FAbsTest.h           |  6 ++--
 libc/test/src/math/smoke/FDimTest.h           | 14 ++++----
 libc/test/src/math/smoke/FMaxTest.h           | 14 ++++----
 libc/test/src/math/smoke/FMaximumMagNumTest.h | 14 ++++----
 libc/test/src/math/smoke/FMaximumMagTest.h    | 14 ++++----
 libc/test/src/math/smoke/FMaximumNumTest.h    | 14 ++++----
 libc/test/src/math/smoke/FMaximumTest.h       | 14 ++++----
 libc/test/src/math/smoke/FMinTest.h           | 14 ++++----
 libc/test/src/math/smoke/FMinimumMagNumTest.h | 14 ++++----
 libc/test/src/math/smoke/FMinimumMagTest.h    | 14 ++++----
 libc/test/src/math/smoke/FMinimumNumTest.h    | 14 ++++----
 libc/test/src/math/smoke/FMinimumTest.h       | 14 ++++----
 libc/test/src/math/smoke/FModTest.h           |  8 ++---
 libc/test/src/math/smoke/FloorTest.h          | 10 +++---
 libc/test/src/math/smoke/FmaTest.h            | 12 +++----
 libc/test/src/math/smoke/FrexpTest.h          | 10 +++---
 libc/test/src/math/smoke/FromfpTest.h         | 36 +++++++++----------
 libc/test/src/math/smoke/FromfpxTest.h        | 36 +++++++++----------
 libc/test/src/math/smoke/GetPayloadTest.h     |  8 ++---
 libc/test/src/math/smoke/ILogbTest.h          | 18 ++++++----
 libc/test/src/math/smoke/IsCanonicalTest.h    | 10 +++---
 libc/test/src/math/smoke/IsNanTest.h          |  8 ++---
 libc/test/src/math/smoke/IsSignalingTest.h    | 10 +++---
 libc/test/src/math/smoke/LdExpTest.h          | 18 +++++-----
 libc/test/src/math/smoke/LogbTest.h           | 12 +++----
 libc/test/src/math/smoke/ModfTest.h           | 12 +++----
 libc/test/src/math/smoke/MulTest.h            | 14 ++++----
 libc/test/src/math/smoke/NearbyIntTest.h      | 20 +++++------
 libc/test/src/math/smoke/NextAfterTest.h      |  8 ++---
 libc/test/src/math/smoke/NextDownTest.h       |  8 ++---
 libc/test/src/math/smoke/NextTowardTest.h     |  8 ++---
 libc/test/src/math/smoke/NextUpTest.h         |  8 ++---
 libc/test/src/math/smoke/RIntTest.h           |  6 ++--
 libc/test/src/math/smoke/RemQuoTest.h         |  8 ++---
 libc/test/src/math/smoke/RoundEvenTest.h      | 10 +++---
 libc/test/src/math/smoke/RoundTest.h          | 10 +++---
 libc/test/src/math/smoke/RoundToIntegerTest.h | 28 ++++++---------
 libc/test/src/math/smoke/ScalbnTest.h         | 16 ++++-----
 libc/test/src/math/smoke/SetPayloadSigTest.h  |  8 ++---
 libc/test/src/math/smoke/SetPayloadTest.h     |  8 ++---
 libc/test/src/math/smoke/SqrtTest.h           | 14 ++++----
 libc/test/src/math/smoke/SubTest.h            | 22 +++++++-----
 libc/test/src/math/smoke/TotalOrderMagTest.h  | 20 +++++------
 libc/test/src/math/smoke/TotalOrderTest.h     | 18 +++++-----
 libc/test/src/math/smoke/TruncTest.h          | 10 +++---
 libc/test/src/math/smoke/UfromfpTest.h        | 36 +++++++++----------
 libc/test/src/math/smoke/UfromfpxTest.h       | 36 +++++++++----------
 libc/test/src/math/smoke/bf16add_test.cpp     |  2 +-
 libc/test/src/math/smoke/bf16addf128_test.cpp |  2 +-
 libc/test/src/math/smoke/bf16addf_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16addl_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16div_test.cpp     |  2 +-
 libc/test/src/math/smoke/bf16divf128_test.cpp |  2 +-
 libc/test/src/math/smoke/bf16divf_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16divl_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16fma_test.cpp     |  2 +-
 libc/test/src/math/smoke/bf16fmaf128_test.cpp |  3 +-
 libc/test/src/math/smoke/bf16fmaf_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16fmal_test.cpp    |  3 +-
 libc/test/src/math/smoke/bf16mul_test.cpp     |  2 +-
 libc/test/src/math/smoke/bf16mulf128_test.cpp |  2 +-
 libc/test/src/math/smoke/bf16mulf_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16mull_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16sub_test.cpp     |  2 +-
 libc/test/src/math/smoke/bf16subf128_test.cpp |  2 +-
 libc/test/src/math/smoke/bf16subf_test.cpp    |  2 +-
 libc/test/src/math/smoke/bf16subl_test.cpp    |  2 +-
 .../test/src/math/smoke/bfloat16_add_test.cpp |  2 +-
 .../test/src/math/smoke/bfloat16_div_test.cpp |  2 +-
 .../test/src/math/smoke/bfloat16_mul_test.cpp |  2 +-
 .../test/src/math/smoke/bfloat16_sub_test.cpp |  2 +-
 .../test/src/math/smoke/canonicalize_test.cpp |  2 +-
 .../src/math/smoke/canonicalizebf16_test.cpp  |  3 +-
 .../src/math/smoke/canonicalizef128_test.cpp  |  3 +-
 .../src/math/smoke/canonicalizef16_test.cpp   |  3 +-
 .../src/math/smoke/canonicalizef_test.cpp     |  2 +-
 .../src/math/smoke/canonicalizel_test.cpp     |  6 ++--
 libc/test/src/math/smoke/cbrtf16_test.cpp     |  4 +--
 libc/test/src/math/smoke/ceil_test.cpp        |  2 +-
 libc/test/src/math/smoke/ceilbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/ceilf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/ceilf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/ceilf_test.cpp       |  2 +-
 libc/test/src/math/smoke/ceill_test.cpp       |  2 +-
 libc/test/src/math/smoke/copysign_test.cpp    |  2 +-
 .../test/src/math/smoke/copysignbf16_test.cpp |  2 +-
 .../test/src/math/smoke/copysignf128_test.cpp |  2 +-
 libc/test/src/math/smoke/copysignf16_test.cpp |  2 +-
 libc/test/src/math/smoke/copysignf_test.cpp   |  2 +-
 libc/test/src/math/smoke/copysignl_test.cpp   |  2 +-
 libc/test/src/math/smoke/daddf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/daddl_test.cpp       |  2 +-
 libc/test/src/math/smoke/ddivf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/ddivl_test.cpp       |  2 +-
 libc/test/src/math/smoke/dfmaf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/dfmal_test.cpp       |  2 +-
 libc/test/src/math/smoke/dmulf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/dmull_test.cpp       |  2 +-
 libc/test/src/math/smoke/dsqrtf128_test.cpp   |  3 +-
 libc/test/src/math/smoke/dsqrtl_test.cpp      |  2 +-
 libc/test/src/math/smoke/dsubf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/dsubl_test.cpp       |  2 +-
 libc/test/src/math/smoke/erff16_test.cpp      | 10 +++---
 libc/test/src/math/smoke/expbf16_test.cpp     |  8 ++---
 libc/test/src/math/smoke/f16add_test.cpp      |  2 +-
 libc/test/src/math/smoke/f16addf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/f16addf_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16addl_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16div_test.cpp      |  2 +-
 libc/test/src/math/smoke/f16divf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/f16divf_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16divl_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16fma_test.cpp      |  2 +-
 libc/test/src/math/smoke/f16fmaf128_test.cpp  |  3 +-
 libc/test/src/math/smoke/f16fmaf_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16fmal_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16mul_test.cpp      |  2 +-
 libc/test/src/math/smoke/f16mulf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/f16mulf_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16mull_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16sqrt_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16sqrtf128_test.cpp |  3 +-
 libc/test/src/math/smoke/f16sqrtf_test.cpp    |  2 +-
 libc/test/src/math/smoke/f16sqrtl_test.cpp    |  3 +-
 libc/test/src/math/smoke/f16sub_test.cpp      |  2 +-
 libc/test/src/math/smoke/f16subf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/f16subf_test.cpp     |  2 +-
 libc/test/src/math/smoke/f16subl_test.cpp     |  2 +-
 libc/test/src/math/smoke/fabs_test.cpp        |  2 +-
 libc/test/src/math/smoke/fabsbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/fabsf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fabsf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fabsf_test.cpp       |  2 +-
 libc/test/src/math/smoke/fabsl_test.cpp       |  2 +-
 libc/test/src/math/smoke/fadd_test.cpp        |  2 +-
 libc/test/src/math/smoke/faddf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/faddl_test.cpp       |  2 +-
 libc/test/src/math/smoke/fdim_test.cpp        |  2 +-
 libc/test/src/math/smoke/fdimbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/fdimf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fdimf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fdimf_test.cpp       |  2 +-
 libc/test/src/math/smoke/fdiml_test.cpp       |  2 +-
 libc/test/src/math/smoke/fdiv_test.cpp        |  2 +-
 libc/test/src/math/smoke/fdivf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fdivl_test.cpp       |  2 +-
 libc/test/src/math/smoke/ffma_test.cpp        |  2 +-
 libc/test/src/math/smoke/ffmaf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/ffmal_test.cpp       |  2 +-
 libc/test/src/math/smoke/floor_test.cpp       |  2 +-
 libc/test/src/math/smoke/floorbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/floorf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/floorf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/floorf_test.cpp      |  2 +-
 libc/test/src/math/smoke/floorl_test.cpp      |  2 +-
 libc/test/src/math/smoke/fma_test.cpp         |  2 +-
 libc/test/src/math/smoke/fmabf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fmaf16_test.cpp      |  2 +-
 libc/test/src/math/smoke/fmaf_test.cpp        |  2 +-
 libc/test/src/math/smoke/fmax_test.cpp        |  2 +-
 libc/test/src/math/smoke/fmaxbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/fmaxf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fmaxf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fmaxf_test.cpp       |  2 +-
 .../src/math/smoke/fmaximum_mag_num_test.cpp  |  3 +-
 .../math/smoke/fmaximum_mag_numbf16_test.cpp  |  3 +-
 .../math/smoke/fmaximum_mag_numf128_test.cpp  |  3 +-
 .../math/smoke/fmaximum_mag_numf16_test.cpp   |  3 +-
 .../src/math/smoke/fmaximum_mag_numf_test.cpp |  3 +-
 .../src/math/smoke/fmaximum_mag_numl_test.cpp |  3 +-
 .../test/src/math/smoke/fmaximum_mag_test.cpp |  2 +-
 .../src/math/smoke/fmaximum_magbf16_test.cpp  |  3 +-
 .../src/math/smoke/fmaximum_magf128_test.cpp  |  3 +-
 .../src/math/smoke/fmaximum_magf16_test.cpp   |  3 +-
 .../src/math/smoke/fmaximum_magf_test.cpp     |  2 +-
 .../src/math/smoke/fmaximum_magl_test.cpp     |  3 +-
 .../test/src/math/smoke/fmaximum_num_test.cpp |  2 +-
 .../src/math/smoke/fmaximum_numbf16_test.cpp  |  3 +-
 .../src/math/smoke/fmaximum_numf128_test.cpp  |  3 +-
 .../src/math/smoke/fmaximum_numf16_test.cpp   |  3 +-
 .../src/math/smoke/fmaximum_numf_test.cpp     |  2 +-
 .../src/math/smoke/fmaximum_numl_test.cpp     |  3 +-
 libc/test/src/math/smoke/fmaximum_test.cpp    |  2 +-
 .../test/src/math/smoke/fmaximumbf16_test.cpp |  2 +-
 .../test/src/math/smoke/fmaximumf128_test.cpp |  2 +-
 libc/test/src/math/smoke/fmaximumf16_test.cpp |  2 +-
 libc/test/src/math/smoke/fmaximumf_test.cpp   |  2 +-
 libc/test/src/math/smoke/fmaximuml_test.cpp   |  2 +-
 libc/test/src/math/smoke/fmaxl_test.cpp       |  2 +-
 libc/test/src/math/smoke/fmin_test.cpp        |  2 +-
 libc/test/src/math/smoke/fminbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/fminf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fminf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fminf_test.cpp       |  2 +-
 .../src/math/smoke/fminimum_mag_num_test.cpp  |  3 +-
 .../math/smoke/fminimum_mag_numbf16_test.cpp  |  3 +-
 .../math/smoke/fminimum_mag_numf128_test.cpp  |  3 +-
 .../math/smoke/fminimum_mag_numf16_test.cpp   |  3 +-
 .../src/math/smoke/fminimum_mag_numf_test.cpp |  3 +-
 .../src/math/smoke/fminimum_mag_numl_test.cpp |  3 +-
 .../test/src/math/smoke/fminimum_mag_test.cpp |  2 +-
 .../src/math/smoke/fminimum_magbf16_test.cpp  |  3 +-
 .../src/math/smoke/fminimum_magf128_test.cpp  |  3 +-
 .../src/math/smoke/fminimum_magf16_test.cpp   |  3 +-
 .../src/math/smoke/fminimum_magf_test.cpp     |  2 +-
 .../src/math/smoke/fminimum_magl_test.cpp     |  3 +-
 .../test/src/math/smoke/fminimum_num_test.cpp |  2 +-
 .../src/math/smoke/fminimum_numbf16_test.cpp  |  3 +-
 .../src/math/smoke/fminimum_numf128_test.cpp  |  3 +-
 .../src/math/smoke/fminimum_numf16_test.cpp   |  3 +-
 .../src/math/smoke/fminimum_numf_test.cpp     |  2 +-
 .../src/math/smoke/fminimum_numl_test.cpp     |  3 +-
 libc/test/src/math/smoke/fminimum_test.cpp    |  2 +-
 .../test/src/math/smoke/fminimumbf16_test.cpp |  2 +-
 .../test/src/math/smoke/fminimumf128_test.cpp |  2 +-
 libc/test/src/math/smoke/fminimumf16_test.cpp |  2 +-
 libc/test/src/math/smoke/fminimumf_test.cpp   |  2 +-
 libc/test/src/math/smoke/fminimuml_test.cpp   |  2 +-
 libc/test/src/math/smoke/fminl_test.cpp       |  2 +-
 libc/test/src/math/smoke/fmod_test.cpp        |  2 +-
 libc/test/src/math/smoke/fmodbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/fmodf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fmodf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/fmodf_test.cpp       |  2 +-
 libc/test/src/math/smoke/fmodl_test.cpp       |  2 +-
 libc/test/src/math/smoke/fmul_test.cpp        |  4 +--
 libc/test/src/math/smoke/fmulf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fmull_test.cpp       |  2 +-
 libc/test/src/math/smoke/frexp_test.cpp       |  2 +-
 libc/test/src/math/smoke/frexpbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/frexpf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/frexpf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/frexpf_test.cpp      |  2 +-
 libc/test/src/math/smoke/frexpl_test.cpp      |  2 +-
 libc/test/src/math/smoke/fromfp_test.cpp      |  2 +-
 libc/test/src/math/smoke/fromfpbf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/fromfpf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/fromfpf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/fromfpf_test.cpp     |  2 +-
 libc/test/src/math/smoke/fromfpl_test.cpp     |  2 +-
 libc/test/src/math/smoke/fromfpx_test.cpp     |  2 +-
 libc/test/src/math/smoke/fromfpxbf16_test.cpp |  2 +-
 libc/test/src/math/smoke/fromfpxf128_test.cpp |  2 +-
 libc/test/src/math/smoke/fromfpxf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/fromfpxf_test.cpp    |  2 +-
 libc/test/src/math/smoke/fromfpxl_test.cpp    |  2 +-
 libc/test/src/math/smoke/fsqrt_test.cpp       |  2 +-
 libc/test/src/math/smoke/fsqrtf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/fsqrtl_test.cpp      |  2 +-
 libc/test/src/math/smoke/fsub_test.cpp        |  2 +-
 libc/test/src/math/smoke/fsubf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/fsubl_test.cpp       |  2 +-
 .../test/src/math/smoke/generic_sqrt_test.cpp |  2 +-
 .../src/math/smoke/generic_sqrtf128_test.cpp  |  3 +-
 .../src/math/smoke/generic_sqrtf_test.cpp     |  2 +-
 .../src/math/smoke/generic_sqrtl_test.cpp     |  3 +-
 libc/test/src/math/smoke/getpayload_test.cpp  |  2 +-
 .../src/math/smoke/getpayloadbf16_test.cpp    |  2 +-
 .../src/math/smoke/getpayloadf128_test.cpp    |  2 +-
 .../src/math/smoke/getpayloadf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/getpayloadf_test.cpp |  2 +-
 libc/test/src/math/smoke/getpayloadl_test.cpp |  2 +-
 libc/test/src/math/smoke/ilogb_test.cpp       |  2 +-
 libc/test/src/math/smoke/ilogbbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/ilogbf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/ilogbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/ilogbf_test.cpp      |  2 +-
 libc/test/src/math/smoke/ilogbl_test.cpp      |  2 +-
 libc/test/src/math/smoke/iscanonical_test.cpp |  2 +-
 .../src/math/smoke/iscanonicalbf16_test.cpp   |  3 +-
 .../src/math/smoke/iscanonicalf128_test.cpp   |  3 +-
 .../src/math/smoke/iscanonicalf16_test.cpp    |  2 +-
 .../test/src/math/smoke/iscanonicalf_test.cpp |  2 +-
 .../test/src/math/smoke/iscanonicall_test.cpp |  2 +-
 libc/test/src/math/smoke/isnanf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/isnanf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/issignaling_test.cpp |  2 +-
 .../src/math/smoke/issignalingbf16_test.cpp   |  3 +-
 .../src/math/smoke/issignalingf128_test.cpp   |  3 +-
 .../src/math/smoke/issignalingf16_test.cpp    |  2 +-
 .../test/src/math/smoke/issignalingf_test.cpp |  2 +-
 .../test/src/math/smoke/issignalingl_test.cpp |  2 +-
 libc/test/src/math/smoke/ldexp_test.cpp       |  2 +-
 libc/test/src/math/smoke/ldexpbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/ldexpf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/ldexpf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/ldexpf_test.cpp      |  2 +-
 libc/test/src/math/smoke/ldexpl_test.cpp      |  2 +-
 libc/test/src/math/smoke/llogb_test.cpp       |  2 +-
 libc/test/src/math/smoke/llogbbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/llogbf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/llogbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/llogbf_test.cpp      |  2 +-
 libc/test/src/math/smoke/llogbl_test.cpp      |  2 +-
 libc/test/src/math/smoke/llrint_test.cpp      |  2 +-
 libc/test/src/math/smoke/llrintbf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/llrintf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/llrintf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/llrintf_test.cpp     |  2 +-
 libc/test/src/math/smoke/llrintl_test.cpp     |  2 +-
 libc/test/src/math/smoke/llround_test.cpp     |  2 +-
 libc/test/src/math/smoke/llroundbf16_test.cpp |  3 +-
 libc/test/src/math/smoke/llroundf128_test.cpp |  3 +-
 libc/test/src/math/smoke/llroundf16_test.cpp  |  3 +-
 libc/test/src/math/smoke/llroundf_test.cpp    |  3 +-
 libc/test/src/math/smoke/llroundl_test.cpp    |  3 +-
 libc/test/src/math/smoke/logb_test.cpp        |  2 +-
 libc/test/src/math/smoke/logbbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/logbf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/logbf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/logbf_test.cpp       |  2 +-
 libc/test/src/math/smoke/logbl_test.cpp       |  2 +-
 libc/test/src/math/smoke/lrint_test.cpp       |  3 +-
 libc/test/src/math/smoke/lrintbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/lrintf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/lrintf16_test.cpp    |  3 +-
 libc/test/src/math/smoke/lrintf_test.cpp      |  3 +-
 libc/test/src/math/smoke/lrintl_test.cpp      |  2 +-
 libc/test/src/math/smoke/lround_test.cpp      |  2 +-
 libc/test/src/math/smoke/lroundbf16_test.cpp  |  3 +-
 libc/test/src/math/smoke/lroundf128_test.cpp  |  3 +-
 libc/test/src/math/smoke/lroundf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/lroundf_test.cpp     |  2 +-
 libc/test/src/math/smoke/lroundl_test.cpp     |  2 +-
 libc/test/src/math/smoke/modf_test.cpp        |  2 +-
 libc/test/src/math/smoke/modfbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/modff128_test.cpp    |  2 +-
 libc/test/src/math/smoke/modff16_test.cpp     |  2 +-
 libc/test/src/math/smoke/modff_test.cpp       |  2 +-
 libc/test/src/math/smoke/modfl_test.cpp       |  2 +-
 libc/test/src/math/smoke/nanbf16_test.cpp     |  8 ++---
 libc/test/src/math/smoke/nearbyint_test.cpp   |  2 +-
 .../src/math/smoke/nearbyintbf16_test.cpp     |  2 +-
 .../src/math/smoke/nearbyintf128_test.cpp     |  2 +-
 .../test/src/math/smoke/nearbyintf16_test.cpp |  2 +-
 libc/test/src/math/smoke/nearbyintf_test.cpp  |  2 +-
 libc/test/src/math/smoke/nearbyintl_test.cpp  |  2 +-
 libc/test/src/math/smoke/nextafter_test.cpp   |  2 +-
 .../src/math/smoke/nextafterbf16_test.cpp     |  2 +-
 .../src/math/smoke/nextafterf128_test.cpp     |  2 +-
 .../test/src/math/smoke/nextafterf16_test.cpp |  2 +-
 libc/test/src/math/smoke/nextafterf_test.cpp  |  2 +-
 libc/test/src/math/smoke/nextafterl_test.cpp  |  2 +-
 libc/test/src/math/smoke/nextdown_test.cpp    |  2 +-
 .../test/src/math/smoke/nextdownbf16_test.cpp |  2 +-
 .../test/src/math/smoke/nextdownf128_test.cpp |  2 +-
 libc/test/src/math/smoke/nextdownf16_test.cpp |  2 +-
 libc/test/src/math/smoke/nextdownf_test.cpp   |  2 +-
 libc/test/src/math/smoke/nextdownl_test.cpp   |  2 +-
 libc/test/src/math/smoke/nexttoward_test.cpp  |  2 +-
 .../src/math/smoke/nexttowardbf16_test.cpp    |  2 +-
 .../src/math/smoke/nexttowardf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/nexttowardf_test.cpp |  2 +-
 libc/test/src/math/smoke/nexttowardl_test.cpp |  2 +-
 libc/test/src/math/smoke/nextup_test.cpp      |  2 +-
 libc/test/src/math/smoke/nextupbf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/nextupf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/nextupf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/nextupf_test.cpp     |  2 +-
 libc/test/src/math/smoke/nextupl_test.cpp     |  2 +-
 libc/test/src/math/smoke/remquo_test.cpp      |  2 +-
 libc/test/src/math/smoke/remquobf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/remquof128_test.cpp  |  2 +-
 libc/test/src/math/smoke/remquof16_test.cpp   |  2 +-
 libc/test/src/math/smoke/remquof_test.cpp     |  2 +-
 libc/test/src/math/smoke/remquol_test.cpp     |  2 +-
 libc/test/src/math/smoke/rint_test.cpp        |  2 +-
 libc/test/src/math/smoke/rintbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/rintf128_test.cpp    |  2 +-
 libc/test/src/math/smoke/rintf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/rintf_test.cpp       |  2 +-
 libc/test/src/math/smoke/rintl_test.cpp       |  2 +-
 libc/test/src/math/smoke/round_test.cpp       |  2 +-
 libc/test/src/math/smoke/roundbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/roundeven_test.cpp   |  2 +-
 .../src/math/smoke/roundevenbf16_test.cpp     |  2 +-
 .../src/math/smoke/roundevenf128_test.cpp     |  2 +-
 .../test/src/math/smoke/roundevenf16_test.cpp |  2 +-
 libc/test/src/math/smoke/roundevenf_test.cpp  |  2 +-
 libc/test/src/math/smoke/roundevenl_test.cpp  |  2 +-
 libc/test/src/math/smoke/roundf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/roundf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/roundf_test.cpp      |  2 +-
 libc/test/src/math/smoke/roundl_test.cpp      |  2 +-
 libc/test/src/math/smoke/scalbln_test.cpp     |  2 +-
 libc/test/src/math/smoke/scalblnbf16_test.cpp |  2 +-
 libc/test/src/math/smoke/scalblnf128_test.cpp |  2 +-
 libc/test/src/math/smoke/scalblnf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/scalblnf_test.cpp    |  2 +-
 libc/test/src/math/smoke/scalblnl_test.cpp    |  2 +-
 libc/test/src/math/smoke/scalbn_test.cpp      |  2 +-
 libc/test/src/math/smoke/scalbnbf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/scalbnf128_test.cpp  |  2 +-
 libc/test/src/math/smoke/scalbnf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/scalbnf_test.cpp     |  2 +-
 libc/test/src/math/smoke/scalbnl_test.cpp     |  2 +-
 libc/test/src/math/smoke/setpayload_test.cpp  |  2 +-
 .../src/math/smoke/setpayloadbf16_test.cpp    |  2 +-
 .../src/math/smoke/setpayloadf128_test.cpp    |  2 +-
 .../src/math/smoke/setpayloadf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/setpayloadf_test.cpp |  2 +-
 libc/test/src/math/smoke/setpayloadl_test.cpp |  2 +-
 .../src/math/smoke/setpayloadsig_test.cpp     |  2 +-
 .../src/math/smoke/setpayloadsigbf16_test.cpp |  3 +-
 .../src/math/smoke/setpayloadsigf128_test.cpp |  3 +-
 .../src/math/smoke/setpayloadsigf16_test.cpp  |  3 +-
 .../src/math/smoke/setpayloadsigf_test.cpp    |  2 +-
 .../src/math/smoke/setpayloadsigl_test.cpp    |  3 +-
 libc/test/src/math/smoke/sqrt_test.cpp        |  2 +-
 libc/test/src/math/smoke/sqrtbf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/sqrtf128_test.cpp    |  4 +--
 libc/test/src/math/smoke/sqrtf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/sqrtf_test.cpp       |  2 +-
 libc/test/src/math/smoke/sqrtl_test.cpp       |  2 +-
 libc/test/src/math/smoke/totalorder_test.cpp  |  2 +-
 .../src/math/smoke/totalorderbf16_test.cpp    |  2 +-
 .../src/math/smoke/totalorderf128_test.cpp    |  2 +-
 .../src/math/smoke/totalorderf16_test.cpp     |  2 +-
 libc/test/src/math/smoke/totalorderf_test.cpp |  2 +-
 libc/test/src/math/smoke/totalorderl_test.cpp |  2 +-
 .../src/math/smoke/totalordermag_test.cpp     |  2 +-
 .../src/math/smoke/totalordermagbf16_test.cpp |  3 +-
 .../src/math/smoke/totalordermagf128_test.cpp |  3 +-
 .../src/math/smoke/totalordermagf16_test.cpp  |  3 +-
 .../src/math/smoke/totalordermagf_test.cpp    |  2 +-
 .../src/math/smoke/totalordermagl_test.cpp    |  3 +-
 libc/test/src/math/smoke/trunc_test.cpp       |  2 +-
 libc/test/src/math/smoke/truncbf16_test.cpp   |  2 +-
 libc/test/src/math/smoke/truncf128_test.cpp   |  2 +-
 libc/test/src/math/smoke/truncf16_test.cpp    |  2 +-
 libc/test/src/math/smoke/truncf_test.cpp      |  2 +-
 libc/test/src/math/smoke/truncl_test.cpp      |  2 +-
 libc/test/src/math/smoke/ufromfp_test.cpp     |  2 +-
 libc/test/src/math/smoke/ufromfpbf16_test.cpp |  2 +-
 libc/test/src/math/smoke/ufromfpf128_test.cpp |  2 +-
 libc/test/src/math/smoke/ufromfpf16_test.cpp  |  2 +-
 libc/test/src/math/smoke/ufromfpf_test.cpp    |  2 +-
 libc/test/src/math/smoke/ufromfpl_test.cpp    |  2 +-
 libc/test/src/math/smoke/ufromfpx_test.cpp    |  2 +-
 .../test/src/math/smoke/ufromfpxbf16_test.cpp |  2 +-
 .../test/src/math/smoke/ufromfpxf128_test.cpp |  2 +-
 libc/test/src/math/smoke/ufromfpxf16_test.cpp |  2 +-
 libc/test/src/math/smoke/ufromfpxf_test.cpp   |  2 +-
 libc/test/src/math/smoke/ufromfpxl_test.cpp   |  2 +-
 libc/test/src/math/sqrt_test.cpp              |  2 +-
 libc/test/src/math/sqrtbf16_test.cpp          |  4 +--
 libc/test/src/math/sqrtf128_test.cpp          |  4 +--
 libc/test/src/math/sqrtf_test.cpp             |  2 +-
 libc/test/src/math/sqrtl_test.cpp             |  2 +-
 libc/test/src/math/trunc_test.cpp             |  2 +-
 libc/test/src/math/truncbf16_test.cpp         |  2 +-
 libc/test/src/math/truncf128_test.cpp         |  2 +-
 libc/test/src/math/truncf16_test.cpp          |  2 +-
 libc/test/src/math/truncf_test.cpp            |  2 +-
 libc/test/src/math/truncl_test.cpp            |  2 +-
 655 files changed, 1259 insertions(+), 1158 deletions(-)

diff --git a/libc/test/src/math/AddTest.h b/libc/test/src/math/AddTest.h
index 4105add4ef4ab..afb7e45333ab0 100644
--- a/libc/test/src/math/AddTest.h
+++ b/libc/test/src/math/AddTest.h
@@ -72,10 +72,12 @@ class AddTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ADD_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcAddTest = AddTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcAddTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcAddTest, NormalRange) { test_normal_range(&func); }
+#define LIST_ADD_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = AddTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #define LIST_ADD_SAME_TYPE_TESTS(suffix, OutType, InType, func)                \
   using LlvmLibcAddTest##suffix = AddTest<OutType, InType>;                    \
diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h
index 3856695d9f732..ab89d6d0e43fd 100644
--- a/libc/test/src/math/CeilTest.h
+++ b/libc/test/src/math/CeilTest.h
@@ -43,8 +43,8 @@ class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_CEIL_TESTS(T, func)                                               \
-  using LlvmLibcCeilTest = CeilTest<T>;                                        \
-  TEST_F(LlvmLibcCeilTest, Range) { testRange(&func); }
+#define LIST_CEIL_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = CeilTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_CEILTEST_H
diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h
index d23ad933a1c89..60b0fb78626c8 100644
--- a/libc/test/src/math/CopySignTest.h
+++ b/libc/test/src/math/CopySignTest.h
@@ -51,7 +51,7 @@ class CopySignTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_COPYSIGN_TESTS(T, func)                                           \
-  using LlvmLibcCopySignTest = CopySignTest<T>;                                \
-  TEST_F(LlvmLibcCopySignTest, SpecialNumbers) { testSpecialNumbers(&func); }  \
-  TEST_F(LlvmLibcCopySignTest, Range) { testRange(&func); }
+#define LIST_COPYSIGN_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = CopySignTest<T>;                                \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
diff --git a/libc/test/src/math/DivTest.h b/libc/test/src/math/DivTest.h
index b990484cdcfce..a6d1014111322 100644
--- a/libc/test/src/math/DivTest.h
+++ b/libc/test/src/math/DivTest.h
@@ -66,9 +66,11 @@ class DivTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_DIV_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcDivTest = DivTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcDivTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcDivTest, NormalRange) { test_normal_range(&func); }
+#define LIST_DIV_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = DivTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_DIVTEST_H
diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h
index b3188d0310b87..34fb627d08947 100644
--- a/libc/test/src/math/FAbsTest.h
+++ b/libc/test/src/math/FAbsTest.h
@@ -48,9 +48,9 @@ class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FABS_TESTS(T, func)                                               \
-  using LlvmLibcFAbsTest = FAbsTest<T>;                                        \
-  TEST_F(LlvmLibcFAbsTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcFAbsTest, Range) { testRange(&func); }
+#define LIST_FABS_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FAbsTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FABSTEST_H
diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h
index 3f62dffa16b93..ea10d9c07db6a 100644
--- a/libc/test/src/math/FMaxTest.h
+++ b/libc/test/src/math/FMaxTest.h
@@ -81,12 +81,12 @@ class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAX_TESTS(T, func)                                               \
-  using LlvmLibcFMaxTest = FMaxTest<T>;                                        \
-  TEST_F(LlvmLibcFMaxTest, NaN) { testNaN(&func); }                            \
-  TEST_F(LlvmLibcFMaxTest, InfArg) { testInfArg(&func); }                      \
-  TEST_F(LlvmLibcFMaxTest, NegInfArg) { testNegInfArg(&func); }                \
-  TEST_F(LlvmLibcFMaxTest, BothZero) { testBothZero(&func); }                  \
-  TEST_F(LlvmLibcFMaxTest, Range) { testRange(&func); }
+#define LIST_FMAX_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FMaxTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMAXTEST_H
diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h
index d4bf26906c231..253ead5eafc57 100644
--- a/libc/test/src/math/FMinTest.h
+++ b/libc/test/src/math/FMinTest.h
@@ -82,12 +82,12 @@ class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMIN_TESTS(T, func)                                               \
-  using LlvmLibcFMinTest = FMinTest<T>;                                        \
-  TEST_F(LlvmLibcFMinTest, NaN) { testNaN(&func); }                            \
-  TEST_F(LlvmLibcFMinTest, InfArg) { testInfArg(&func); }                      \
-  TEST_F(LlvmLibcFMinTest, NegInfArg) { testNegInfArg(&func); }                \
-  TEST_F(LlvmLibcFMinTest, BothZero) { testBothZero(&func); }                  \
-  TEST_F(LlvmLibcFMinTest, Range) { testRange(&func); }
+#define LIST_FMIN_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FMinTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMINTEST_H
diff --git a/libc/test/src/math/FModTest.h b/libc/test/src/math/FModTest.h
index c8ac74e5e20e1..63320f7d3c9bf 100644
--- a/libc/test/src/math/FModTest.h
+++ b/libc/test/src/math/FModTest.h
@@ -258,9 +258,9 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMOD_TESTS(T, func)                                               \
-  using LlvmLibcFmodTest = FmodTest<T>;                                        \
-  TEST_F(LlvmLibcFmodTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcFmodTest, RegularExtreme) { testRegularExtreme(&func); }
+#define LIST_FMOD_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FmodTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RegularExtreme) { testRegularExtreme(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMODTEST_H
diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h
index 28c16f4421fa6..308304232353c 100644
--- a/libc/test/src/math/FloorTest.h
+++ b/libc/test/src/math/FloorTest.h
@@ -43,8 +43,8 @@ class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FLOOR_TESTS(T, func)                                              \
-  using LlvmLibcFloorTest = FloorTest<T>;                                      \
-  TEST_F(LlvmLibcFloorTest, Range) { testRange(&func); }
+#define LIST_FLOOR_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = FloorTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FLOORTEST_H
diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h
index c1e0fab482026..aea83a815b0ba 100644
--- a/libc/test/src/math/FmaTest.h
+++ b/libc/test/src/math/FmaTest.h
@@ -93,14 +93,18 @@ class FmaTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMA_TESTS(T, func)                                                \
-  using LlvmLibcFmaTest = FmaTestTemplate<T>;                                  \
-  TEST_F(LlvmLibcFmaTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcFmaTest, NormalRange) { test_normal_range(&func); }
+#define LIST_FMA_TESTS(Name, T, func)                                          \
+  using LlvmLibc##Name##Test = FmaTestTemplate<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
-#define LIST_NARROWING_FMA_TESTS(OutType, InType, func)                        \
-  using LlvmLibcFmaTest = FmaTestTemplate<OutType, InType>;                    \
-  TEST_F(LlvmLibcFmaTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcFmaTest, NormalRange) { test_normal_range(&func); }
+#define LIST_NARROWING_FMA_TESTS(Name, OutType, InType, func)                  \
+  using LlvmLibc##Name##Test = FmaTestTemplate<OutType, InType>;               \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMATEST_H
diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h
index 36207b54dda86..f15f18828a6aa 100644
--- a/libc/test/src/math/FrexpTest.h
+++ b/libc/test/src/math/FrexpTest.h
@@ -112,9 +112,9 @@ class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FREXP_TESTS(T, func)                                              \
-  using LlvmLibcFrexpTest = FrexpTest<T>;                                      \
-  TEST_F(LlvmLibcFrexpTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcFrexpTest, PowersOfTwo) { testPowersOfTwo(&func); }           \
-  TEST_F(LlvmLibcFrexpTest, SomeIntegers) { testSomeIntegers(&func); }         \
-  TEST_F(LlvmLibcFrexpTest, InRange) { testRange(&func); }
+#define LIST_FREXP_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = FrexpTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SomeIntegers) { testSomeIntegers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InRange) { testRange(&func); }
diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h
index cff2aebcba48c..92dfb46aa54ff 100644
--- a/libc/test/src/math/LdExpTest.h
+++ b/libc/test/src/math/LdExpTest.h
@@ -154,17 +154,17 @@ class LdExpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_LDEXP_TESTS(T, func)                                              \
-  using LlvmLibcLdExpTest = LdExpTestTemplate<T>;                              \
-  TEST_F(LlvmLibcLdExpTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcLdExpTest, PowersOfTwo) { testPowersOfTwo(&func); }           \
-  TEST_F(LlvmLibcLdExpTest, OverFlow) { testOverflow(&func); }                 \
-  TEST_F(LlvmLibcLdExpTest, UnderflowToZeroOnNormal) {                         \
+#define LIST_LDEXP_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = LdExpTestTemplate<T>;                           \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, OverFlow) { testOverflow(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnNormal) {                      \
     testUnderflowToZeroOnNormal(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcLdExpTest, UnderflowToZeroOnSubnormal) {                      \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnSubnormal) {                   \
     testUnderflowToZeroOnSubnormal(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcLdExpTest, NormalOperation) { testNormalOperation(&func); }
+  TEST_F(LlvmLibc##Name##Test, NormalOperation) { testNormalOperation(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_LDEXPTEST_H
diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h
index 83ac99b7d4ebd..5eda0f648a117 100644
--- a/libc/test/src/math/LogbTest.h
+++ b/libc/test/src/math/LogbTest.h
@@ -88,9 +88,9 @@ class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_LOGB_TESTS(T, func)                                               \
-  using LlvmLibcLogbTest = LogbTest<T>;                                        \
-  TEST_F(LlvmLibcLogbTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcLogbTest, PowersOfTwo) { testPowersOfTwo(&func); }            \
-  TEST_F(LlvmLibcLogbTest, SomeIntegers) { testSomeIntegers(&func); }          \
-  TEST_F(LlvmLibcLogbTest, InRange) { testRange(&func); }
+#define LIST_LOGB_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = LogbTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SomeIntegers) { testSomeIntegers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InRange) { testRange(&func); }
diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h
index a6def094c07eb..00e665bac5f1b 100644
--- a/libc/test/src/math/ModfTest.h
+++ b/libc/test/src/math/ModfTest.h
@@ -102,9 +102,9 @@ class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_MODF_TESTS(T, func)                                               \
-  using LlvmLibcModfTest = ModfTest<T>;                                        \
-  TEST_F(LlvmLibcModfTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcModfTest, RoundedNubmers) { testIntegers(&func); }            \
-  TEST_F(LlvmLibcModfTest, Fractions) { testFractions(&func); }                \
-  TEST_F(LlvmLibcModfTest, Range) { testRange(&func); }
+#define LIST_MODF_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = ModfTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testIntegers(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
diff --git a/libc/test/src/math/MulTest.h b/libc/test/src/math/MulTest.h
index 5f74087a6bc5c..08ac115a6c4ea 100644
--- a/libc/test/src/math/MulTest.h
+++ b/libc/test/src/math/MulTest.h
@@ -87,9 +87,11 @@ class MulTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_MUL_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcMulTest = MulTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcMulTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcMulTest, NormalRange) { test_normal_range(&func); }
+#define LIST_MUL_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = MulTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_MULTEST_H
diff --git a/libc/test/src/math/NearbyIntTest.h b/libc/test/src/math/NearbyIntTest.h
index 6e79f318a194d..304a9dcdf3d52 100644
--- a/libc/test/src/math/NearbyIntTest.h
+++ b/libc/test/src/math/NearbyIntTest.h
@@ -106,13 +106,13 @@ class NearbyIntTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEARBYINT_TESTS(F, func)                                          \
-  using LlvmLibcNearbyIntTest = NearbyIntTestTemplate<F>;                      \
-  TEST_F(LlvmLibcNearbyIntTest, RoundNumbers) { test_round_numbers(&func); }   \
-  TEST_F(LlvmLibcNearbyIntTest, Fractions) { test_fractions(&func); }          \
-  TEST_F(LlvmLibcNearbyIntTest, SubnormalRange) {                              \
+#define LIST_NEARBYINT_TESTS(Name, F, func)                                    \
+  using LlvmLibc##Name##Test = NearbyIntTestTemplate<F>;                       \
+  TEST_F(LlvmLibc##Name##Test, RoundNumbers) { test_round_numbers(&func); }    \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { test_fractions(&func); }           \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
     test_subnormal_range(&func);                                               \
   }                                                                            \
-  TEST_F(LlvmLibcNearbyIntTest, NormalRange) { test_normal_range(&func); }
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEARBYINTTEST_H
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index 82d5378ec3533..c3832abe117c0 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -186,9 +186,9 @@ class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEXTAFTER_TESTS(T, func)                                          \
-  using LlvmLibcNextAfterTest = NextAfterTestTemplate<T>;                      \
-  TEST_F(LlvmLibcNextAfterTest, TestNaN) { testNaN(&func); }                   \
-  TEST_F(LlvmLibcNextAfterTest, TestBoundaries) { testBoundaries(&func); }
+#define LIST_NEXTAFTER_TESTS(Name, T, func)                                    \
+  using LlvmLibc##Name##Test = NextAfterTestTemplate<T>;                       \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestBoundaries) { testBoundaries(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h
index 990db3ea026c7..a33f73b8ca300 100644
--- a/libc/test/src/math/RIntTest.h
+++ b/libc/test/src/math/RIntTest.h
@@ -122,12 +122,12 @@ class RIntTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_RINT_TESTS(F, func)                                               \
-  using LlvmLibcRIntTest = RIntTestTemplate<F>;                                \
-  TEST_F(LlvmLibcRIntTest, specialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcRIntTest, RoundNumbers) { testRoundNumbers(&func); }          \
-  TEST_F(LlvmLibcRIntTest, Fractions) { testFractions(&func); }                \
-  TEST_F(LlvmLibcRIntTest, SubnormalRange) { testSubnormalRange(&func); }      \
-  TEST_F(LlvmLibcRIntTest, NormalRange) { testNormalRange(&func); }
+#define LIST_RINT_TESTS(Name, F, func)                                         \
+  using LlvmLibc##Name##Test = RIntTestTemplate<F>;                            \
+  TEST_F(LlvmLibc##Name##Test, specialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundNumbers) { testRoundNumbers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) { testSubnormalRange(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { testNormalRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_RINTTEST_H
diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h
index 4e135ce7cc4f6..b4a6a4b57e1c2 100644
--- a/libc/test/src/math/RemQuoTest.h
+++ b/libc/test/src/math/RemQuoTest.h
@@ -141,13 +141,13 @@ class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_REMQUO_TESTS(T, func)                                             \
-  using LlvmLibcRemQuoTest = RemQuoTestTemplate<T>;                            \
-  TEST_F(LlvmLibcRemQuoTest, SpecialNumbers) { testSpecialNumbers(&func); }    \
-  TEST_F(LlvmLibcRemQuoTest, EqualNumeratorAndDenominator) {                   \
+#define LIST_REMQUO_TESTS(Name, T, func)                                       \
+  using LlvmLibc##Name##Test = RemQuoTestTemplate<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, EqualNumeratorAndDenominator) {                 \
     testEqualNumeratorAndDenominator(&func);                                   \
   }                                                                            \
-  TEST_F(LlvmLibcRemQuoTest, SubnormalRange) { testSubnormalRange(&func); }    \
-  TEST_F(LlvmLibcRemQuoTest, NormalRange) { testNormalRange(&func); }
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) { testSubnormalRange(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { testNormalRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_REMQUOTEST_H
diff --git a/libc/test/src/math/RoundEvenTest.h b/libc/test/src/math/RoundEvenTest.h
index 761c258fc5573..766a723897051 100644
--- a/libc/test/src/math/RoundEvenTest.h
+++ b/libc/test/src/math/RoundEvenTest.h
@@ -87,11 +87,11 @@ class RoundEvenTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ROUNDEVEN_TESTS(T, func)                                          \
-  using LlvmLibcRoundEvenTest = RoundEvenTest<T>;                              \
-  TEST_F(LlvmLibcRoundEvenTest, SpecialNumbers) { testSpecialNumbers(&func); } \
-  TEST_F(LlvmLibcRoundEvenTest, RoundedNubmers) { testRoundedNumbers(&func); } \
-  TEST_F(LlvmLibcRoundEvenTest, Fractions) { testFractions(&func); }           \
-  TEST_F(LlvmLibcRoundEvenTest, Range) { testRange(&func); }
+#define LIST_ROUNDEVEN_TESTS(Name, T, func)                                    \
+  using LlvmLibc##Name##Test = RoundEvenTest<T>;                               \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_ROUNDEVENTEST_H
diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h
index b82f3562c2f32..d9b4678628eef 100644
--- a/libc/test/src/math/RoundTest.h
+++ b/libc/test/src/math/RoundTest.h
@@ -42,8 +42,8 @@ class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ROUND_TESTS(T, func)                                              \
-  using LlvmLibcRoundTest = RoundTest<T>;                                      \
-  TEST_F(LlvmLibcRoundTest, Range) { testRange(&func); }
+#define LIST_ROUND_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = RoundTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_ROUNDTEST_H
diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h
index 27c87fb6cdd47..a9202593955c4 100644
--- a/libc/test/src/math/RoundToIntegerTest.h
+++ b/libc/test/src/math/RoundToIntegerTest.h
@@ -261,29 +261,23 @@ class RoundToIntegerTestTemplate
   }
 };
 
-#define LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func,           \
+#define LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func,     \
                                            TestModes)                          \
-  using LlvmLibcRoundToIntegerTest =                                           \
+  using LlvmLibc##Name##Test =                                                 \
       RoundToIntegerTestTemplate<FloatType, IntType, TestModes>;               \
-  TEST_F(LlvmLibcRoundToIntegerTest, InfinityAndNaN) {                         \
-    testInfinityAndNaN(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, RoundNumbers) {                           \
-    testRoundNumbers(&func);                                                   \
-  }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, Fractions) { testFractions(&func); }      \
-  TEST_F(LlvmLibcRoundToIntegerTest, IntegerOverflow) {                        \
+  TEST_F(LlvmLibc##Name##Test, InfinityAndNaN) { testInfinityAndNaN(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundNumbers) { testRoundNumbers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, IntegerOverflow) {                              \
     testIntegerOverflow(&func);                                                \
   }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, SubnormalRange) {                         \
-    testSubnormalRange(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, NormalRange) { testNormalRange(&func); }
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) { testSubnormalRange(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { testNormalRange(&func); }
 
-#define LIST_ROUND_TO_INTEGER_TESTS(FloatType, IntType, func)                  \
-  LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func, false)
+#define LIST_ROUND_TO_INTEGER_TESTS(Name, FloatType, IntType, func)            \
+  LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func, false)
 
-#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(FloatType, IntType, func)       \
-  LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func, true)
+#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Name, FloatType, IntType, func) \
+  LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func, true)
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_ROUNDTOINTEGERTEST_H
diff --git a/libc/test/src/math/RsqrtTest.h b/libc/test/src/math/RsqrtTest.h
index 253cacd7d2cec..07edaa356ca32 100644
--- a/libc/test/src/math/RsqrtTest.h
+++ b/libc/test/src/math/RsqrtTest.h
@@ -61,14 +61,18 @@ class RsqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_RSQRT_TESTS(T, func)                                              \
-  using LlvmLibcRsqrtTest = RsqrtTest<T, T>;                                   \
-  TEST_F(LlvmLibcRsqrtTest, DenormalValues) { test_denormal_values(&func); }   \
-  TEST_F(LlvmLibcRsqrtTest, NormalRange) { test_normal_range(&func); }
+#define LIST_RSQRT_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = RsqrtTest<T, T>;                                \
+  TEST_F(LlvmLibc##Name##Test, DenormalValues) {                               \
+    test_denormal_values(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
-#define LIST_NARROWING_RSQRT_TESTS(OutType, InType, func)                      \
-  using LlvmLibcRsqrtTest = RsqrtTest<OutType, InType>;                        \
-  TEST_F(LlvmLibcRsqrtTest, DenormalValues) { test_denormal_values(&func); }   \
-  TEST_F(LlvmLibcRsqrtTest, NormalRange) { test_normal_range(&func); }
+#define LIST_NARROWING_RSQRT_TESTS(Name, OutType, InType, func)                \
+  using LlvmLibc##Name##Test = RsqrtTest<OutType, InType>;                     \
+  TEST_F(LlvmLibc##Name##Test, DenormalValues) {                               \
+    test_denormal_values(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_RSQRTTEST_H
diff --git a/libc/test/src/math/ScalbnTest.h b/libc/test/src/math/ScalbnTest.h
index e1d035c4ea3aa..fc1d1ac60b92a 100644
--- a/libc/test/src/math/ScalbnTest.h
+++ b/libc/test/src/math/ScalbnTest.h
@@ -12,17 +12,17 @@
 #include "LdExpTest.h"
 #include "test/UnitTest/Test.h"
 
-#define LIST_SCALBN_TESTS(T, func)                                             \
-  using LlvmLibcScalbnTest = LdExpTestTemplate<T>;                             \
-  TEST_F(LlvmLibcScalbnTest, SpecialNumbers) { testSpecialNumbers(&func); }    \
-  TEST_F(LlvmLibcScalbnTest, PowersOfTwo) { testPowersOfTwo(&func); }          \
-  TEST_F(LlvmLibcScalbnTest, OverFlow) { testOverflow(&func); }                \
-  TEST_F(LlvmLibcScalbnTest, UnderflowToZeroOnNormal) {                        \
+#define LIST_SCALBN_TESTS(Name, T, func)                                       \
+  using LlvmLibc##Name##Test = LdExpTestTemplate<T>;                           \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, OverFlow) { testOverflow(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnNormal) {                      \
     testUnderflowToZeroOnNormal(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcScalbnTest, UnderflowToZeroOnSubnormal) {                     \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnSubnormal) {                   \
     testUnderflowToZeroOnSubnormal(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcScalbnTest, NormalOperation) { testNormalOperation(&func); }
+  TEST_F(LlvmLibc##Name##Test, NormalOperation) { testNormalOperation(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SCALBN_H
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index d59f5309a085c..67055a0b7fd87 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -53,12 +53,16 @@ class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SQRT_TESTS(T, func)                                               \
-  using LlvmLibcSqrtTest = SqrtTest<T, T>;                                     \
-  TEST_F(LlvmLibcSqrtTest, DenormalValues) { test_denormal_values(&func); }    \
-  TEST_F(LlvmLibcSqrtTest, NormalRange) { test_normal_range(&func); }
+#define LIST_SQRT_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = SqrtTest<T, T>;                                 \
+  TEST_F(LlvmLibc##Name##Test, DenormalValues) {                               \
+    test_denormal_values(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
-#define LIST_NARROWING_SQRT_TESTS(OutType, InType, func)                       \
-  using LlvmLibcSqrtTest = SqrtTest<OutType, InType>;                          \
-  TEST_F(LlvmLibcSqrtTest, DenormalValues) { test_denormal_values(&func); }    \
-  TEST_F(LlvmLibcSqrtTest, NormalRange) { test_normal_range(&func); }
+#define LIST_NARROWING_SQRT_TESTS(Name, OutType, InType, func)                 \
+  using LlvmLibc##Name##Test = SqrtTest<OutType, InType>;                      \
+  TEST_F(LlvmLibc##Name##Test, DenormalValues) {                               \
+    test_denormal_values(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
diff --git a/libc/test/src/math/SubTest.h b/libc/test/src/math/SubTest.h
index 6cf3e7ba751ef..2aacce8f8b5ca 100644
--- a/libc/test/src/math/SubTest.h
+++ b/libc/test/src/math/SubTest.h
@@ -72,10 +72,12 @@ class SubTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SUB_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcSubTest = SubTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcSubTest, SubnormalRange) { test_subnormal_range(&func); }     \
-  TEST_F(LlvmLibcSubTest, NormalRange) { test_normal_range(&func); }
+#define LIST_SUB_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = SubTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&func); }
 
 #define LIST_SUB_SAME_TYPE_TESTS(suffix, OutType, InType, func)                \
   using LlvmLibcSubTest##suffix = SubTest<OutType, InType>;                    \
diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h
index 2e1c2f64c07db..70c14c07457ee 100644
--- a/libc/test/src/math/TruncTest.h
+++ b/libc/test/src/math/TruncTest.h
@@ -43,8 +43,8 @@ class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_TRUNC_TESTS(T, func)                                              \
-  using LlvmLibcTruncTest = TruncTest<T>;                                      \
-  TEST_F(LlvmLibcTruncTest, Range) { testRange(&func); }
+#define LIST_TRUNC_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = TruncTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_TRUNCTEST_H
diff --git a/libc/test/src/math/bf16add_test.cpp b/libc/test/src/math/bf16add_test.cpp
index 9e9c594d7d7eb..8f9b6a745a778 100644
--- a/libc/test/src/math/bf16add_test.cpp
+++ b/libc/test/src/math/bf16add_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16add.h"
 
-LIST_ADD_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16add)
+LIST_ADD_TESTS(Bf16add, bfloat16, double, LIBC_NAMESPACE::bf16add)
diff --git a/libc/test/src/math/bf16addf128_test.cpp b/libc/test/src/math/bf16addf128_test.cpp
index 46f7ad329f237..74f3e22e4cc35 100644
--- a/libc/test/src/math/bf16addf128_test.cpp
+++ b/libc/test/src/math/bf16addf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addf128.h"
 
-LIST_ADD_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16addf128)
+LIST_ADD_TESTS(Bf16addf128, bfloat16, float128, LIBC_NAMESPACE::bf16addf128)
diff --git a/libc/test/src/math/bf16addf_test.cpp b/libc/test/src/math/bf16addf_test.cpp
index 06d56cf21ebd2..ff8f6da6f6113 100644
--- a/libc/test/src/math/bf16addf_test.cpp
+++ b/libc/test/src/math/bf16addf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addf.h"
 
-LIST_ADD_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16addf)
+LIST_ADD_TESTS(Bf16addf, bfloat16, float, LIBC_NAMESPACE::bf16addf)
diff --git a/libc/test/src/math/bf16addl_test.cpp b/libc/test/src/math/bf16addl_test.cpp
index bf548272d31c1..7ee75c02cd035 100644
--- a/libc/test/src/math/bf16addl_test.cpp
+++ b/libc/test/src/math/bf16addl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addl.h"
 
-LIST_ADD_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16addl)
+LIST_ADD_TESTS(Bf16addl, bfloat16, long double, LIBC_NAMESPACE::bf16addl)
diff --git a/libc/test/src/math/bf16div_test.cpp b/libc/test/src/math/bf16div_test.cpp
index 4516351fb93a3..6be131b08e985 100644
--- a/libc/test/src/math/bf16div_test.cpp
+++ b/libc/test/src/math/bf16div_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16div.h"
 
-LIST_DIV_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16div)
+LIST_DIV_TESTS(Bf16div, bfloat16, double, LIBC_NAMESPACE::bf16div)
diff --git a/libc/test/src/math/bf16divf128_test.cpp b/libc/test/src/math/bf16divf128_test.cpp
index c42c5bb067050..adcb659688fc1 100644
--- a/libc/test/src/math/bf16divf128_test.cpp
+++ b/libc/test/src/math/bf16divf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divf128.h"
 
-LIST_DIV_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16divf128)
+LIST_DIV_TESTS(Bf16divf128, bfloat16, float128, LIBC_NAMESPACE::bf16divf128)
diff --git a/libc/test/src/math/bf16divf_test.cpp b/libc/test/src/math/bf16divf_test.cpp
index 873920b225a77..a18e6fafaf01b 100644
--- a/libc/test/src/math/bf16divf_test.cpp
+++ b/libc/test/src/math/bf16divf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divf.h"
 
-LIST_DIV_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16divf)
+LIST_DIV_TESTS(Bf16divf, bfloat16, float, LIBC_NAMESPACE::bf16divf)
diff --git a/libc/test/src/math/bf16divl_test.cpp b/libc/test/src/math/bf16divl_test.cpp
index 32ecd6228de0b..08dc8670faf05 100644
--- a/libc/test/src/math/bf16divl_test.cpp
+++ b/libc/test/src/math/bf16divl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divl.h"
 
-LIST_DIV_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16divl)
+LIST_DIV_TESTS(Bf16divl, bfloat16, long double, LIBC_NAMESPACE::bf16divl)
diff --git a/libc/test/src/math/bf16fma_test.cpp b/libc/test/src/math/bf16fma_test.cpp
index 81c73a0cb6947..b0529385436dc 100644
--- a/libc/test/src/math/bf16fma_test.cpp
+++ b/libc/test/src/math/bf16fma_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fma.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16fma)
+LIST_NARROWING_FMA_TESTS(Bf16fma, bfloat16, double, LIBC_NAMESPACE::bf16fma)
diff --git a/libc/test/src/math/bf16fmaf128_test.cpp b/libc/test/src/math/bf16fmaf128_test.cpp
index dd8f4735c3497..251beaac95ad0 100644
--- a/libc/test/src/math/bf16fmaf128_test.cpp
+++ b/libc/test/src/math/bf16fmaf128_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmaf128.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16fmaf128)
+LIST_NARROWING_FMA_TESTS(Bf16fmaf128, bfloat16, float128,
+                         LIBC_NAMESPACE::bf16fmaf128)
diff --git a/libc/test/src/math/bf16fmaf_test.cpp b/libc/test/src/math/bf16fmaf_test.cpp
index 04c674892833a..76ee8f470074d 100644
--- a/libc/test/src/math/bf16fmaf_test.cpp
+++ b/libc/test/src/math/bf16fmaf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmaf.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16fmaf)
+LIST_NARROWING_FMA_TESTS(Bf16fmaf, bfloat16, float, LIBC_NAMESPACE::bf16fmaf)
diff --git a/libc/test/src/math/bf16fmal_test.cpp b/libc/test/src/math/bf16fmal_test.cpp
index 4c45e2c64312d..f2e9d60244ff5 100644
--- a/libc/test/src/math/bf16fmal_test.cpp
+++ b/libc/test/src/math/bf16fmal_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmal.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16fmal)
+LIST_NARROWING_FMA_TESTS(Bf16fmal, bfloat16, long double,
+                         LIBC_NAMESPACE::bf16fmal)
diff --git a/libc/test/src/math/bf16mul_test.cpp b/libc/test/src/math/bf16mul_test.cpp
index 3682705556b0a..2dd1798d65894 100644
--- a/libc/test/src/math/bf16mul_test.cpp
+++ b/libc/test/src/math/bf16mul_test.cpp
@@ -12,4 +12,4 @@
 
 #include "src/__support/FPUtil/bfloat16.h"
 
-LIST_MUL_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16mul)
+LIST_MUL_TESTS(Bf16mul, bfloat16, double, LIBC_NAMESPACE::bf16mul)
diff --git a/libc/test/src/math/bf16mulf128_test.cpp b/libc/test/src/math/bf16mulf128_test.cpp
index 6aee2687ae67a..039a599ee84d6 100644
--- a/libc/test/src/math/bf16mulf128_test.cpp
+++ b/libc/test/src/math/bf16mulf128_test.cpp
@@ -12,4 +12,4 @@
 
 #include "src/__support/FPUtil/bfloat16.h"
 
-LIST_MUL_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16mulf128)
+LIST_MUL_TESTS(Bf16mulf128, bfloat16, float128, LIBC_NAMESPACE::bf16mulf128)
diff --git a/libc/test/src/math/bf16mulf_test.cpp b/libc/test/src/math/bf16mulf_test.cpp
index 048b60f8e85cf..78cfedfdef4de 100644
--- a/libc/test/src/math/bf16mulf_test.cpp
+++ b/libc/test/src/math/bf16mulf_test.cpp
@@ -12,4 +12,4 @@
 
 #include "src/__support/FPUtil/bfloat16.h"
 
-LIST_MUL_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16mulf)
+LIST_MUL_TESTS(Bf16mulf, bfloat16, float, LIBC_NAMESPACE::bf16mulf)
diff --git a/libc/test/src/math/bf16mull_test.cpp b/libc/test/src/math/bf16mull_test.cpp
index b8439b245c261..54f06b958f7a7 100644
--- a/libc/test/src/math/bf16mull_test.cpp
+++ b/libc/test/src/math/bf16mull_test.cpp
@@ -12,4 +12,4 @@
 
 #include "src/__support/FPUtil/bfloat16.h"
 
-LIST_MUL_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16mull)
+LIST_MUL_TESTS(Bf16mull, bfloat16, long double, LIBC_NAMESPACE::bf16mull)
diff --git a/libc/test/src/math/bf16sub_test.cpp b/libc/test/src/math/bf16sub_test.cpp
index 4a793dc493891..f0509ecd8b375 100644
--- a/libc/test/src/math/bf16sub_test.cpp
+++ b/libc/test/src/math/bf16sub_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16sub.h"
 
-LIST_SUB_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16sub)
+LIST_SUB_TESTS(Bf16sub, bfloat16, double, LIBC_NAMESPACE::bf16sub)
diff --git a/libc/test/src/math/bf16subf128_test.cpp b/libc/test/src/math/bf16subf128_test.cpp
index 25d6711f71346..66efe06fe7c97 100644
--- a/libc/test/src/math/bf16subf128_test.cpp
+++ b/libc/test/src/math/bf16subf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subf128.h"
 
-LIST_SUB_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16subf128)
+LIST_SUB_TESTS(Bf16subf128, bfloat16, float128, LIBC_NAMESPACE::bf16subf128)
diff --git a/libc/test/src/math/bf16subf_test.cpp b/libc/test/src/math/bf16subf_test.cpp
index e8c7440230f1d..1429e0d3d76d4 100644
--- a/libc/test/src/math/bf16subf_test.cpp
+++ b/libc/test/src/math/bf16subf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subf.h"
 
-LIST_SUB_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16subf)
+LIST_SUB_TESTS(Bf16subf, bfloat16, float, LIBC_NAMESPACE::bf16subf)
diff --git a/libc/test/src/math/bf16subl_test.cpp b/libc/test/src/math/bf16subl_test.cpp
index 299736949d713..aa60fbcdbbf89 100644
--- a/libc/test/src/math/bf16subl_test.cpp
+++ b/libc/test/src/math/bf16subl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subl.h"
 
-LIST_SUB_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16subl)
+LIST_SUB_TESTS(Bf16subl, bfloat16, long double, LIBC_NAMESPACE::bf16subl)
diff --git a/libc/test/src/math/ceil_test.cpp b/libc/test/src/math/ceil_test.cpp
index 800452a43426c..1223e3d404266 100644
--- a/libc/test/src/math/ceil_test.cpp
+++ b/libc/test/src/math/ceil_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceil.h"
 
-LIST_CEIL_TESTS(double, LIBC_NAMESPACE::ceil)
+LIST_CEIL_TESTS(Ceil, double, LIBC_NAMESPACE::ceil)
diff --git a/libc/test/src/math/ceilbf16_test.cpp b/libc/test/src/math/ceilbf16_test.cpp
index 3cbd9de0a611e..1528daea79148 100644
--- a/libc/test/src/math/ceilbf16_test.cpp
+++ b/libc/test/src/math/ceilbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ceilbf16.h"
 
-LIST_CEIL_TESTS(bfloat16, LIBC_NAMESPACE::ceilbf16)
+LIST_CEIL_TESTS(Ceilbf16, bfloat16, LIBC_NAMESPACE::ceilbf16)
diff --git a/libc/test/src/math/ceilf128_test.cpp b/libc/test/src/math/ceilf128_test.cpp
index ba5a768610a65..3612f16d0a1eb 100644
--- a/libc/test/src/math/ceilf128_test.cpp
+++ b/libc/test/src/math/ceilf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_CEIL_TESTS(float128, LIBC_NAMESPACE::ceilf128)
+LIST_CEIL_TESTS(Ceilf128, float128, LIBC_NAMESPACE::ceilf128)
diff --git a/libc/test/src/math/ceilf16_test.cpp b/libc/test/src/math/ceilf16_test.cpp
index a6ec922836a75..402834bd9b629 100644
--- a/libc/test/src/math/ceilf16_test.cpp
+++ b/libc/test/src/math/ceilf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceilf16.h"
 
-LIST_CEIL_TESTS(float16, LIBC_NAMESPACE::ceilf16)
+LIST_CEIL_TESTS(Ceilf16, float16, LIBC_NAMESPACE::ceilf16)
diff --git a/libc/test/src/math/ceilf_test.cpp b/libc/test/src/math/ceilf_test.cpp
index 2a2504228adb0..e731bd2e89ec3 100644
--- a/libc/test/src/math/ceilf_test.cpp
+++ b/libc/test/src/math/ceilf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceilf.h"
 
-LIST_CEIL_TESTS(float, LIBC_NAMESPACE::ceilf)
+LIST_CEIL_TESTS(Ceilf, float, LIBC_NAMESPACE::ceilf)
diff --git a/libc/test/src/math/ceill_test.cpp b/libc/test/src/math/ceill_test.cpp
index 0f766602a0f6d..353c8dc570eba 100644
--- a/libc/test/src/math/ceill_test.cpp
+++ b/libc/test/src/math/ceill_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceill.h"
 
-LIST_CEIL_TESTS(long double, LIBC_NAMESPACE::ceill)
+LIST_CEIL_TESTS(Ceill, long double, LIBC_NAMESPACE::ceill)
diff --git a/libc/test/src/math/copysign_test.cpp b/libc/test/src/math/copysign_test.cpp
index 5b3d812c02da4..9bf436b5ae3e1 100644
--- a/libc/test/src/math/copysign_test.cpp
+++ b/libc/test/src/math/copysign_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysign.h"
 
-LIST_COPYSIGN_TESTS(double, LIBC_NAMESPACE::copysign)
+LIST_COPYSIGN_TESTS(Copysign, double, LIBC_NAMESPACE::copysign)
diff --git a/libc/test/src/math/copysignf_test.cpp b/libc/test/src/math/copysignf_test.cpp
index 344ffee2359ec..201a386a57e7f 100644
--- a/libc/test/src/math/copysignf_test.cpp
+++ b/libc/test/src/math/copysignf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysignf.h"
 
-LIST_COPYSIGN_TESTS(float, LIBC_NAMESPACE::copysignf)
+LIST_COPYSIGN_TESTS(Copysignf, float, LIBC_NAMESPACE::copysignf)
diff --git a/libc/test/src/math/copysignl_test.cpp b/libc/test/src/math/copysignl_test.cpp
index bed60678dc161..595ba7e910ff4 100644
--- a/libc/test/src/math/copysignl_test.cpp
+++ b/libc/test/src/math/copysignl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysignl.h"
 
-LIST_COPYSIGN_TESTS(long double, LIBC_NAMESPACE::copysignl)
+LIST_COPYSIGN_TESTS(Copysignl, long double, LIBC_NAMESPACE::copysignl)
diff --git a/libc/test/src/math/daddl_test.cpp b/libc/test/src/math/daddl_test.cpp
index 7a34d962d5207..39fa66cb97135 100644
--- a/libc/test/src/math/daddl_test.cpp
+++ b/libc/test/src/math/daddl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/daddl.h"
 
-LIST_ADD_TESTS(double, long double, LIBC_NAMESPACE::daddl)
+LIST_ADD_TESTS(Daddl, double, long double, LIBC_NAMESPACE::daddl)
diff --git a/libc/test/src/math/ddivl_test.cpp b/libc/test/src/math/ddivl_test.cpp
index 7768766e30c12..22fe0306b3264 100644
--- a/libc/test/src/math/ddivl_test.cpp
+++ b/libc/test/src/math/ddivl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ddivl.h"
 
-LIST_DIV_TESTS(double, long double, LIBC_NAMESPACE::ddivl)
+LIST_DIV_TESTS(Ddivl, double, long double, LIBC_NAMESPACE::ddivl)
diff --git a/libc/test/src/math/dfmal_test.cpp b/libc/test/src/math/dfmal_test.cpp
index 3c38f5eb7db9d..e6c92d6ce1025 100644
--- a/libc/test/src/math/dfmal_test.cpp
+++ b/libc/test/src/math/dfmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dfmal.h"
 
-LIST_NARROWING_FMA_TESTS(double, long double, LIBC_NAMESPACE::dfmal)
+LIST_NARROWING_FMA_TESTS(Dfmal, double, long double, LIBC_NAMESPACE::dfmal)
diff --git a/libc/test/src/math/dmull_test.cpp b/libc/test/src/math/dmull_test.cpp
index 1b9c9c2c24ed3..0e095323382fe 100644
--- a/libc/test/src/math/dmull_test.cpp
+++ b/libc/test/src/math/dmull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dmull.h"
 
-LIST_MUL_TESTS(double, long double, LIBC_NAMESPACE::dmull)
+LIST_MUL_TESTS(Dmull, double, long double, LIBC_NAMESPACE::dmull)
diff --git a/libc/test/src/math/dsqrtl_test.cpp b/libc/test/src/math/dsqrtl_test.cpp
index c178e389a57cd..58502bd89da51 100644
--- a/libc/test/src/math/dsqrtl_test.cpp
+++ b/libc/test/src/math/dsqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dsqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(double, long double, LIBC_NAMESPACE::dsqrtl)
+LIST_NARROWING_SQRT_TESTS(Dsqrtl, double, long double, LIBC_NAMESPACE::dsqrtl)
diff --git a/libc/test/src/math/dsubl_test.cpp b/libc/test/src/math/dsubl_test.cpp
index 98846e0b6e3b3..5ccacf81b4546 100644
--- a/libc/test/src/math/dsubl_test.cpp
+++ b/libc/test/src/math/dsubl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dsubl.h"
 
-LIST_SUB_TESTS(double, long double, LIBC_NAMESPACE::dsubl)
+LIST_SUB_TESTS(Dsubl, double, long double, LIBC_NAMESPACE::dsubl)
diff --git a/libc/test/src/math/exhaustive/acospif_test.cpp b/libc/test/src/math/exhaustive/acospif_test.cpp
index fcc6a774617f1..3faaf8e82bec8 100644
--- a/libc/test/src/math/exhaustive/acospif_test.cpp
+++ b/libc/test/src/math/exhaustive/acospif_test.cpp
@@ -12,7 +12,7 @@
 
 namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
 
-using LlvmLibcAsinfExhaustiveTest =
+using LlvmLibcAcospifExhaustiveTest =
     LlvmLibcUnaryOpExhaustiveMathTest<float, mpfr::Operation::Acospi,
                                       LIBC_NAMESPACE::acospif>;
 
@@ -20,7 +20,7 @@ using LlvmLibcAsinfExhaustiveTest =
 static constexpr uint32_t POS_START = 0x0000'0000U;
 static constexpr uint32_t POS_STOP = 0x7f80'0000U;
 
-TEST_F(LlvmLibcAsinfExhaustiveTest, PostiveRange) {
+TEST_F(LlvmLibcAcospifExhaustiveTest, PostiveRange) {
   test_full_range_all_roundings(POS_START, POS_STOP);
 }
 
@@ -28,6 +28,6 @@ TEST_F(LlvmLibcAsinfExhaustiveTest, PostiveRange) {
 static constexpr uint32_t NEG_START = 0xb000'0000U;
 static constexpr uint32_t NEG_STOP = 0xff80'0000U;
 
-TEST_F(LlvmLibcAsinfExhaustiveTest, NegativeRange) {
+TEST_F(LlvmLibcAcospifExhaustiveTest, NegativeRange) {
   test_full_range_all_roundings(NEG_START, NEG_STOP);
 }
diff --git a/libc/test/src/math/exhaustive/cosf_float_test.cpp b/libc/test/src/math/exhaustive/cosf_float_test.cpp
index 0c3a98832c84d..a5d3f08795dbf 100644
--- a/libc/test/src/math/exhaustive/cosf_float_test.cpp
+++ b/libc/test/src/math/exhaustive/cosf_float_test.cpp
@@ -17,7 +17,7 @@ float cosf_fast(float x) {
       /*IS_SIN*/ false>(x);
 }
 
-using LlvmLibcCosfExhaustiveTest =
+using LlvmLibcCosfFloatExhaustiveTest =
     LlvmLibcUnaryOpExhaustiveMathTest<float, mpfr::Operation::Cos, cosf_fast,
                                       3>;
 
@@ -25,7 +25,7 @@ using LlvmLibcCosfExhaustiveTest =
 static constexpr uint32_t POS_START = 0x0000'0000U;
 static constexpr uint32_t POS_STOP = 0x7f80'0000U;
 
-TEST_F(LlvmLibcCosfExhaustiveTest, PostiveRange) {
+TEST_F(LlvmLibcCosfFloatExhaustiveTest, PostiveRange) {
   std::cout << "-- Testing for FE_TONEAREST in range [0x" << std::hex
             << POS_START << ", 0x" << POS_STOP << ") --" << std::dec
             << std::endl;
@@ -36,7 +36,7 @@ TEST_F(LlvmLibcCosfExhaustiveTest, PostiveRange) {
 static constexpr uint32_t NEG_START = 0x8000'0000U;
 static constexpr uint32_t NEG_STOP = 0xff80'0000U;
 
-TEST_F(LlvmLibcCosfExhaustiveTest, NegativeRange) {
+TEST_F(LlvmLibcCosfFloatExhaustiveTest, NegativeRange) {
   std::cout << "-- Testing for FE_TONEAREST in range [0x" << std::hex
             << NEG_START << ", 0x" << NEG_STOP << ") --" << std::dec
             << std::endl;
diff --git a/libc/test/src/math/exhaustive/fmodbf16_test.cpp b/libc/test/src/math/exhaustive/fmodbf16_test.cpp
index 122be7a367d45..da18c5ef93024 100644
--- a/libc/test/src/math/exhaustive/fmodbf16_test.cpp
+++ b/libc/test/src/math/exhaustive/fmodbf16_test.cpp
@@ -13,7 +13,7 @@
 
 namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
 
-using LlvmLibcFmodf16ExhaustiveTest =
+using LlvmLibcFmodbf16ExhaustiveTest =
     LlvmLibcBinaryOpExhaustiveMathTest<bfloat16, mpfr::Operation::Fmod,
                                        LIBC_NAMESPACE::fmodbf16>;
 
@@ -25,18 +25,18 @@ static constexpr uint16_t POS_STOP = 0x7f80U;
 static constexpr uint16_t NEG_START = 0x8000U;
 static constexpr uint16_t NEG_STOP = 0xff80U;
 
-TEST_F(LlvmLibcFmodf16ExhaustiveTest, PostivePositiveRange) {
+TEST_F(LlvmLibcFmodbf16ExhaustiveTest, PostivePositiveRange) {
   test_full_range_all_roundings(POS_START, POS_STOP, POS_START, POS_STOP);
 }
 
-TEST_F(LlvmLibcFmodf16ExhaustiveTest, PostiveNegativeRange) {
+TEST_F(LlvmLibcFmodbf16ExhaustiveTest, PostiveNegativeRange) {
   test_full_range_all_roundings(POS_START, POS_STOP, NEG_START, NEG_STOP);
 }
 
-TEST_F(LlvmLibcFmodf16ExhaustiveTest, NegativePositiveRange) {
+TEST_F(LlvmLibcFmodbf16ExhaustiveTest, NegativePositiveRange) {
   test_full_range_all_roundings(NEG_START, NEG_STOP, POS_START, POS_STOP);
 }
 
-TEST_F(LlvmLibcFmodf16ExhaustiveTest, NegativeNegativeRange) {
+TEST_F(LlvmLibcFmodbf16ExhaustiveTest, NegativeNegativeRange) {
   test_full_range_all_roundings(NEG_START, NEG_STOP, NEG_START, NEG_STOP);
 }
diff --git a/libc/test/src/math/exhaustive/lgammaf_test.cpp b/libc/test/src/math/exhaustive/lgammaf_test.cpp
index 743d43a70abb1..776e06b21b134 100644
--- a/libc/test/src/math/exhaustive/lgammaf_test.cpp
+++ b/libc/test/src/math/exhaustive/lgammaf_test.cpp
@@ -10,8 +10,6 @@
 #include "src/math/lgammaf.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-using LlvmLibcLgammafTest = LIBC_NAMESPACE::testing::FPTest<float>;
-
 using LlvmLibcLgammafExhaustiveTest =
     LlvmLibcUnaryOpExhaustiveMathTest<float, mpfr::Operation::Lgamma,
                                       LIBC_NAMESPACE::lgammaf>;
diff --git a/libc/test/src/math/exhaustive/rsqrtf_test.cpp b/libc/test/src/math/exhaustive/rsqrtf_test.cpp
index 803c9b4820fc2..e051458b7abda 100644
--- a/libc/test/src/math/exhaustive/rsqrtf_test.cpp
+++ b/libc/test/src/math/exhaustive/rsqrtf_test.cpp
@@ -10,8 +10,6 @@
 #include "src/math/rsqrtf.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-using LlvmLibcRsqrtfTest = LIBC_NAMESPACE::testing::FPTest<float>;
-
 using LlvmLibcRsqrtfExhaustiveTest =
     LlvmLibcUnaryOpExhaustiveMathTest<float, mpfr::Operation::Rsqrt,
                                       LIBC_NAMESPACE::rsqrtf>;
diff --git a/libc/test/src/math/exhaustive/sinf_float_test.cpp b/libc/test/src/math/exhaustive/sinf_float_test.cpp
index 1e735e6bcf0ba..93d226603609a 100644
--- a/libc/test/src/math/exhaustive/sinf_float_test.cpp
+++ b/libc/test/src/math/exhaustive/sinf_float_test.cpp
@@ -20,7 +20,7 @@ float sinf_fast(float x) {
       /*IS_SIN*/ true>(x);
 }
 
-using LlvmLibcSinfExhaustiveTest =
+using LlvmLibcSinfFloatExhaustiveTest =
     LlvmLibcUnaryOpExhaustiveMathTest<float, mpfr::Operation::Sin, sinf_fast,
                                       3>;
 
@@ -28,7 +28,7 @@ using LlvmLibcSinfExhaustiveTest =
 static constexpr uint32_t POS_START = 0x0000'0000U;
 static constexpr uint32_t POS_STOP = 0x7f80'0000U;
 
-TEST_F(LlvmLibcSinfExhaustiveTest, PostiveRange) {
+TEST_F(LlvmLibcSinfFloatExhaustiveTest, PostiveRange) {
   std::cout << "-- Testing for FE_TONEAREST in range [0x" << std::hex
             << POS_START << ", 0x" << POS_STOP << ") --" << std::dec
             << std::endl;
@@ -39,7 +39,7 @@ TEST_F(LlvmLibcSinfExhaustiveTest, PostiveRange) {
 static constexpr uint32_t NEG_START = 0x8000'0000U;
 static constexpr uint32_t NEG_STOP = 0xff80'0000U;
 
-TEST_F(LlvmLibcSinfExhaustiveTest, NegativeRange) {
+TEST_F(LlvmLibcSinfFloatExhaustiveTest, NegativeRange) {
   std::cout << "-- Testing for FE_TONEAREST in range [0x" << std::hex
             << NEG_START << ", 0x" << NEG_STOP << ") --" << std::dec
             << std::endl;
diff --git a/libc/test/src/math/f16add_test.cpp b/libc/test/src/math/f16add_test.cpp
index c47ece2a92555..df8907bf8b1b8 100644
--- a/libc/test/src/math/f16add_test.cpp
+++ b/libc/test/src/math/f16add_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16add.h"
 
-LIST_ADD_TESTS(float16, double, LIBC_NAMESPACE::f16add)
+LIST_ADD_TESTS(F16add, float16, double, LIBC_NAMESPACE::f16add)
diff --git a/libc/test/src/math/f16addf_test.cpp b/libc/test/src/math/f16addf_test.cpp
index 1e8b4323114ad..416eb3d68794a 100644
--- a/libc/test/src/math/f16addf_test.cpp
+++ b/libc/test/src/math/f16addf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16addf.h"
 
-LIST_ADD_TESTS(float16, float, LIBC_NAMESPACE::f16addf)
+LIST_ADD_TESTS(F16addf, float16, float, LIBC_NAMESPACE::f16addf)
diff --git a/libc/test/src/math/f16addl_test.cpp b/libc/test/src/math/f16addl_test.cpp
index f8e0d9ba6b4de..902057f745b33 100644
--- a/libc/test/src/math/f16addl_test.cpp
+++ b/libc/test/src/math/f16addl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16addl.h"
 
-LIST_ADD_TESTS(float16, long double, LIBC_NAMESPACE::f16addl)
+LIST_ADD_TESTS(F16addl, float16, long double, LIBC_NAMESPACE::f16addl)
diff --git a/libc/test/src/math/f16div_test.cpp b/libc/test/src/math/f16div_test.cpp
index 0bfa69f9b8028..cc9fd57ae2bf0 100644
--- a/libc/test/src/math/f16div_test.cpp
+++ b/libc/test/src/math/f16div_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16div.h"
 
-LIST_DIV_TESTS(float16, double, LIBC_NAMESPACE::f16div)
+LIST_DIV_TESTS(F16div, float16, double, LIBC_NAMESPACE::f16div)
diff --git a/libc/test/src/math/f16divf_test.cpp b/libc/test/src/math/f16divf_test.cpp
index 85be1ebcd55c9..8db88d8191090 100644
--- a/libc/test/src/math/f16divf_test.cpp
+++ b/libc/test/src/math/f16divf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16divf.h"
 
-LIST_DIV_TESTS(float16, float, LIBC_NAMESPACE::f16divf)
+LIST_DIV_TESTS(F16divf, float16, float, LIBC_NAMESPACE::f16divf)
diff --git a/libc/test/src/math/f16divl_test.cpp b/libc/test/src/math/f16divl_test.cpp
index bad3e70a477b4..f841b8346a91e 100644
--- a/libc/test/src/math/f16divl_test.cpp
+++ b/libc/test/src/math/f16divl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16divl.h"
 
-LIST_DIV_TESTS(float16, long double, LIBC_NAMESPACE::f16divl)
+LIST_DIV_TESTS(F16divl, float16, long double, LIBC_NAMESPACE::f16divl)
diff --git a/libc/test/src/math/f16fma_test.cpp b/libc/test/src/math/f16fma_test.cpp
index 2e46b5bdd4682..21693ee52ba36 100644
--- a/libc/test/src/math/f16fma_test.cpp
+++ b/libc/test/src/math/f16fma_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fma.h"
 
-LIST_NARROWING_FMA_TESTS(float16, double, LIBC_NAMESPACE::f16fma)
+LIST_NARROWING_FMA_TESTS(F16fma, float16, double, LIBC_NAMESPACE::f16fma)
diff --git a/libc/test/src/math/f16fmaf_test.cpp b/libc/test/src/math/f16fmaf_test.cpp
index 5e3aec768c191..62ff601e1b94b 100644
--- a/libc/test/src/math/f16fmaf_test.cpp
+++ b/libc/test/src/math/f16fmaf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fmaf.h"
 
-LIST_NARROWING_FMA_TESTS(float16, float, LIBC_NAMESPACE::f16fmaf)
+LIST_NARROWING_FMA_TESTS(F16fmaf, float16, float, LIBC_NAMESPACE::f16fmaf)
diff --git a/libc/test/src/math/f16fmal_test.cpp b/libc/test/src/math/f16fmal_test.cpp
index 5394268a9cd8f..1af1d47040621 100644
--- a/libc/test/src/math/f16fmal_test.cpp
+++ b/libc/test/src/math/f16fmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fmal.h"
 
-LIST_NARROWING_FMA_TESTS(float16, long double, LIBC_NAMESPACE::f16fmal)
+LIST_NARROWING_FMA_TESTS(F16fmal, float16, long double, LIBC_NAMESPACE::f16fmal)
diff --git a/libc/test/src/math/f16mul_test.cpp b/libc/test/src/math/f16mul_test.cpp
index 49b443870c483..5078758a2ff51 100644
--- a/libc/test/src/math/f16mul_test.cpp
+++ b/libc/test/src/math/f16mul_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mul.h"
 
-LIST_MUL_TESTS(float16, double, LIBC_NAMESPACE::f16mul)
+LIST_MUL_TESTS(F16mul, float16, double, LIBC_NAMESPACE::f16mul)
diff --git a/libc/test/src/math/f16mulf_test.cpp b/libc/test/src/math/f16mulf_test.cpp
index bf2530863621d..a5aa916142c1a 100644
--- a/libc/test/src/math/f16mulf_test.cpp
+++ b/libc/test/src/math/f16mulf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mulf.h"
 
-LIST_MUL_TESTS(float16, float, LIBC_NAMESPACE::f16mulf)
+LIST_MUL_TESTS(F16mulf, float16, float, LIBC_NAMESPACE::f16mulf)
diff --git a/libc/test/src/math/f16mull_test.cpp b/libc/test/src/math/f16mull_test.cpp
index 5292ddb87b7f4..739c1e81087bd 100644
--- a/libc/test/src/math/f16mull_test.cpp
+++ b/libc/test/src/math/f16mull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mull.h"
 
-LIST_MUL_TESTS(float16, long double, LIBC_NAMESPACE::f16mull)
+LIST_MUL_TESTS(F16mull, float16, long double, LIBC_NAMESPACE::f16mull)
diff --git a/libc/test/src/math/f16sqrt_test.cpp b/libc/test/src/math/f16sqrt_test.cpp
index 759b388ad3b3d..e18fc6af96ca1 100644
--- a/libc/test/src/math/f16sqrt_test.cpp
+++ b/libc/test/src/math/f16sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sqrt.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, double, LIBC_NAMESPACE::f16sqrt)
+LIST_NARROWING_SQRT_TESTS(F16sqrt, float16, double, LIBC_NAMESPACE::f16sqrt)
diff --git a/libc/test/src/math/f16sqrtf_test.cpp b/libc/test/src/math/f16sqrtf_test.cpp
index 36231aeb4184d..2b654aa0601ea 100644
--- a/libc/test/src/math/f16sqrtf_test.cpp
+++ b/libc/test/src/math/f16sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sqrtf.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, float, LIBC_NAMESPACE::f16sqrtf)
+LIST_NARROWING_SQRT_TESTS(F16sqrtf, float16, float, LIBC_NAMESPACE::f16sqrtf)
diff --git a/libc/test/src/math/f16sqrtl_test.cpp b/libc/test/src/math/f16sqrtl_test.cpp
index 4e069bc8dbffd..7e61b9089a3e2 100644
--- a/libc/test/src/math/f16sqrtl_test.cpp
+++ b/libc/test/src/math/f16sqrtl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/f16sqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, long double, LIBC_NAMESPACE::f16sqrtl)
+LIST_NARROWING_SQRT_TESTS(F16sqrtl, float16, long double,
+                          LIBC_NAMESPACE::f16sqrtl)
diff --git a/libc/test/src/math/f16sub_test.cpp b/libc/test/src/math/f16sub_test.cpp
index 37b970952fe5e..b9d3e0fe071bf 100644
--- a/libc/test/src/math/f16sub_test.cpp
+++ b/libc/test/src/math/f16sub_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sub.h"
 
-LIST_SUB_TESTS(float16, double, LIBC_NAMESPACE::f16sub)
+LIST_SUB_TESTS(F16sub, float16, double, LIBC_NAMESPACE::f16sub)
diff --git a/libc/test/src/math/f16subf_test.cpp b/libc/test/src/math/f16subf_test.cpp
index 68ad9482ab1e4..0a9e990b17e9a 100644
--- a/libc/test/src/math/f16subf_test.cpp
+++ b/libc/test/src/math/f16subf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16subf.h"
 
-LIST_SUB_TESTS(float16, float, LIBC_NAMESPACE::f16subf)
+LIST_SUB_TESTS(F16subf, float16, float, LIBC_NAMESPACE::f16subf)
diff --git a/libc/test/src/math/f16subl_test.cpp b/libc/test/src/math/f16subl_test.cpp
index c41e6e97bab09..a19a169c17724 100644
--- a/libc/test/src/math/f16subl_test.cpp
+++ b/libc/test/src/math/f16subl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16subl.h"
 
-LIST_SUB_TESTS(float16, long double, LIBC_NAMESPACE::f16subl)
+LIST_SUB_TESTS(F16subl, float16, long double, LIBC_NAMESPACE::f16subl)
diff --git a/libc/test/src/math/fabs_test.cpp b/libc/test/src/math/fabs_test.cpp
index 0447040ddae30..0925fcb55674f 100644
--- a/libc/test/src/math/fabs_test.cpp
+++ b/libc/test/src/math/fabs_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabs.h"
 
-LIST_FABS_TESTS(double, LIBC_NAMESPACE::fabs)
+LIST_FABS_TESTS(Fabs, double, LIBC_NAMESPACE::fabs)
diff --git a/libc/test/src/math/fabsbf16_test.cpp b/libc/test/src/math/fabsbf16_test.cpp
index 2ac14763b7c41..4e34224d2e644 100644
--- a/libc/test/src/math/fabsbf16_test.cpp
+++ b/libc/test/src/math/fabsbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fabsbf16.h"
 
-LIST_FABS_TESTS(bfloat16, LIBC_NAMESPACE::fabsbf16)
+LIST_FABS_TESTS(Fabsbf16, bfloat16, LIBC_NAMESPACE::fabsbf16)
diff --git a/libc/test/src/math/fabsf16_test.cpp b/libc/test/src/math/fabsf16_test.cpp
index cf6b8f5e7a3cd..2117172b89b5c 100644
--- a/libc/test/src/math/fabsf16_test.cpp
+++ b/libc/test/src/math/fabsf16_test.cpp
@@ -15,4 +15,4 @@
 
 #include "src/math/fabsf16.h"
 
-LIST_FABS_TESTS(float16, LIBC_NAMESPACE::fabsf16)
+LIST_FABS_TESTS(Fabsf16, float16, LIBC_NAMESPACE::fabsf16)
diff --git a/libc/test/src/math/fabsf_test.cpp b/libc/test/src/math/fabsf_test.cpp
index 9f1e2a66d4765..d801ad71e031e 100644
--- a/libc/test/src/math/fabsf_test.cpp
+++ b/libc/test/src/math/fabsf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabsf.h"
 
-LIST_FABS_TESTS(float, LIBC_NAMESPACE::fabsf)
+LIST_FABS_TESTS(Fabsf, float, LIBC_NAMESPACE::fabsf)
diff --git a/libc/test/src/math/fabsl_test.cpp b/libc/test/src/math/fabsl_test.cpp
index 37d2b54a4c53e..bb671e271211d 100644
--- a/libc/test/src/math/fabsl_test.cpp
+++ b/libc/test/src/math/fabsl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabsl.h"
 
-LIST_FABS_TESTS(long double, LIBC_NAMESPACE::fabsl)
+LIST_FABS_TESTS(Fabsl, long double, LIBC_NAMESPACE::fabsl)
diff --git a/libc/test/src/math/fadd_test.cpp b/libc/test/src/math/fadd_test.cpp
index fe9ac8b252ed3..13db60482b192 100644
--- a/libc/test/src/math/fadd_test.cpp
+++ b/libc/test/src/math/fadd_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fadd.h"
 
-LIST_ADD_TESTS(float, double, LIBC_NAMESPACE::fadd)
+LIST_ADD_TESTS(Fadd, float, double, LIBC_NAMESPACE::fadd)
diff --git a/libc/test/src/math/faddl_test.cpp b/libc/test/src/math/faddl_test.cpp
index 9c99b32ee7c42..856cd389813fb 100644
--- a/libc/test/src/math/faddl_test.cpp
+++ b/libc/test/src/math/faddl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/faddl.h"
 
-LIST_ADD_TESTS(float, long double, LIBC_NAMESPACE::faddl)
+LIST_ADD_TESTS(Faddl, float, long double, LIBC_NAMESPACE::faddl)
diff --git a/libc/test/src/math/fdim_test.cpp b/libc/test/src/math/fdim_test.cpp
index 1e8adf036ddea..fd7a9f1fa6afb 100644
--- a/libc/test/src/math/fdim_test.cpp
+++ b/libc/test/src/math/fdim_test.cpp
@@ -14,20 +14,20 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-using LlvmLibcFDimTest = FDimTestTemplate<double>;
+using LlvmLibcFdimTest = FDimTestTemplate<double>;
 
-TEST_F(LlvmLibcFDimTest, NaNArg_fdim) { test_na_n_arg(&LIBC_NAMESPACE::fdim); }
+TEST_F(LlvmLibcFdimTest, NaNArg_fdim) { test_na_n_arg(&LIBC_NAMESPACE::fdim); }
 
-TEST_F(LlvmLibcFDimTest, InfArg_fdim) { test_inf_arg(&LIBC_NAMESPACE::fdim); }
+TEST_F(LlvmLibcFdimTest, InfArg_fdim) { test_inf_arg(&LIBC_NAMESPACE::fdim); }
 
-TEST_F(LlvmLibcFDimTest, NegInfArg_fdim) {
+TEST_F(LlvmLibcFdimTest, NegInfArg_fdim) {
   test_neg_inf_arg(&LIBC_NAMESPACE::fdim);
 }
 
-TEST_F(LlvmLibcFDimTest, BothZero_fdim) {
+TEST_F(LlvmLibcFdimTest, BothZero_fdim) {
   test_both_zero(&LIBC_NAMESPACE::fdim);
 }
 
-TEST_F(LlvmLibcFDimTest, InDoubleRange_fdim) {
+TEST_F(LlvmLibcFdimTest, InDoubleRange_fdim) {
   test_in_range(&LIBC_NAMESPACE::fdim);
 }
diff --git a/libc/test/src/math/fdimf_test.cpp b/libc/test/src/math/fdimf_test.cpp
index 13e61d9082da4..8dd213c110b81 100644
--- a/libc/test/src/math/fdimf_test.cpp
+++ b/libc/test/src/math/fdimf_test.cpp
@@ -14,22 +14,24 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-using LlvmLibcFDimTest = FDimTestTemplate<float>;
+using LlvmLibcFdimfTest = FDimTestTemplate<float>;
 
-TEST_F(LlvmLibcFDimTest, NaNArg_fdimf) {
+TEST_F(LlvmLibcFdimfTest, NaNArg_fdimf) {
   test_na_n_arg(&LIBC_NAMESPACE::fdimf);
 }
 
-TEST_F(LlvmLibcFDimTest, InfArg_fdimf) { test_inf_arg(&LIBC_NAMESPACE::fdimf); }
+TEST_F(LlvmLibcFdimfTest, InfArg_fdimf) {
+  test_inf_arg(&LIBC_NAMESPACE::fdimf);
+}
 
-TEST_F(LlvmLibcFDimTest, NegInfArg_fdimf) {
+TEST_F(LlvmLibcFdimfTest, NegInfArg_fdimf) {
   test_neg_inf_arg(&LIBC_NAMESPACE::fdimf);
 }
 
-TEST_F(LlvmLibcFDimTest, BothZero_fdimf) {
+TEST_F(LlvmLibcFdimfTest, BothZero_fdimf) {
   test_both_zero(&LIBC_NAMESPACE::fdimf);
 }
 
-TEST_F(LlvmLibcFDimTest, InFloatRange_fdimf) {
+TEST_F(LlvmLibcFdimfTest, InFloatRange_fdimf) {
   test_in_range(&LIBC_NAMESPACE::fdimf);
 }
diff --git a/libc/test/src/math/fdiml_test.cpp b/libc/test/src/math/fdiml_test.cpp
index 2d99d2134c1c0..988c999b07161 100644
--- a/libc/test/src/math/fdiml_test.cpp
+++ b/libc/test/src/math/fdiml_test.cpp
@@ -14,22 +14,24 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-using LlvmLibcFDimTest = FDimTestTemplate<long double>;
+using LlvmLibcFdimlTest = FDimTestTemplate<long double>;
 
-TEST_F(LlvmLibcFDimTest, NaNArg_fdiml) {
+TEST_F(LlvmLibcFdimlTest, NaNArg_fdiml) {
   test_na_n_arg(&LIBC_NAMESPACE::fdiml);
 }
 
-TEST_F(LlvmLibcFDimTest, InfArg_fdiml) { test_inf_arg(&LIBC_NAMESPACE::fdiml); }
+TEST_F(LlvmLibcFdimlTest, InfArg_fdiml) {
+  test_inf_arg(&LIBC_NAMESPACE::fdiml);
+}
 
-TEST_F(LlvmLibcFDimTest, NegInfArg_fdiml) {
+TEST_F(LlvmLibcFdimlTest, NegInfArg_fdiml) {
   test_neg_inf_arg(&LIBC_NAMESPACE::fdiml);
 }
 
-TEST_F(LlvmLibcFDimTest, BothZero_fdiml) {
+TEST_F(LlvmLibcFdimlTest, BothZero_fdiml) {
   test_both_zero(&LIBC_NAMESPACE::fdiml);
 }
 
-TEST_F(LlvmLibcFDimTest, InLongDoubleRange_fdiml) {
+TEST_F(LlvmLibcFdimlTest, InLongDoubleRange_fdiml) {
   test_in_range(&LIBC_NAMESPACE::fdiml);
 }
diff --git a/libc/test/src/math/fdiv_test.cpp b/libc/test/src/math/fdiv_test.cpp
index f0bd602003b28..d53af73a41ab2 100644
--- a/libc/test/src/math/fdiv_test.cpp
+++ b/libc/test/src/math/fdiv_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdiv.h"
 
-LIST_DIV_TESTS(float, double, LIBC_NAMESPACE::fdiv)
+LIST_DIV_TESTS(Fdiv, float, double, LIBC_NAMESPACE::fdiv)
diff --git a/libc/test/src/math/fdivl_test.cpp b/libc/test/src/math/fdivl_test.cpp
index bc2b0e4d9f060..2b9caa85dcb27 100644
--- a/libc/test/src/math/fdivl_test.cpp
+++ b/libc/test/src/math/fdivl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdivl.h"
 
-LIST_DIV_TESTS(float, long double, LIBC_NAMESPACE::fdivl)
+LIST_DIV_TESTS(Fdivl, float, long double, LIBC_NAMESPACE::fdivl)
diff --git a/libc/test/src/math/ffma_test.cpp b/libc/test/src/math/ffma_test.cpp
index 4b6a25c50d15c..a24525d57cd5f 100644
--- a/libc/test/src/math/ffma_test.cpp
+++ b/libc/test/src/math/ffma_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ffma.h"
 
-LIST_NARROWING_FMA_TESTS(float, double, LIBC_NAMESPACE::ffma)
+LIST_NARROWING_FMA_TESTS(Ffma, float, double, LIBC_NAMESPACE::ffma)
diff --git a/libc/test/src/math/ffmal_test.cpp b/libc/test/src/math/ffmal_test.cpp
index 200d9e16839d0..a699042943f05 100644
--- a/libc/test/src/math/ffmal_test.cpp
+++ b/libc/test/src/math/ffmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ffmal.h"
 
-LIST_NARROWING_FMA_TESTS(float, long double, LIBC_NAMESPACE::ffmal)
+LIST_NARROWING_FMA_TESTS(Ffmal, float, long double, LIBC_NAMESPACE::ffmal)
diff --git a/libc/test/src/math/floor_test.cpp b/libc/test/src/math/floor_test.cpp
index 9231d07aeb7f8..d92cf18703075 100644
--- a/libc/test/src/math/floor_test.cpp
+++ b/libc/test/src/math/floor_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floor.h"
 
-LIST_FLOOR_TESTS(double, LIBC_NAMESPACE::floor)
+LIST_FLOOR_TESTS(Floor, double, LIBC_NAMESPACE::floor)
diff --git a/libc/test/src/math/floorbf16_test.cpp b/libc/test/src/math/floorbf16_test.cpp
index d11ca17dad74c..263ab24fd4a03 100644
--- a/libc/test/src/math/floorbf16_test.cpp
+++ b/libc/test/src/math/floorbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/floorbf16.h"
 
-LIST_FLOOR_TESTS(bfloat16, LIBC_NAMESPACE::floorbf16)
+LIST_FLOOR_TESTS(Floorbf16, bfloat16, LIBC_NAMESPACE::floorbf16)
diff --git a/libc/test/src/math/floorf128_test.cpp b/libc/test/src/math/floorf128_test.cpp
index bc9e4db891c46..938634d0b8a76 100644
--- a/libc/test/src/math/floorf128_test.cpp
+++ b/libc/test/src/math/floorf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FLOOR_TESTS(float128, LIBC_NAMESPACE::floorf128)
+LIST_FLOOR_TESTS(Floorf128, float128, LIBC_NAMESPACE::floorf128)
diff --git a/libc/test/src/math/floorf16_test.cpp b/libc/test/src/math/floorf16_test.cpp
index ca5160e927035..bdfa26ec99b49 100644
--- a/libc/test/src/math/floorf16_test.cpp
+++ b/libc/test/src/math/floorf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorf16.h"
 
-LIST_FLOOR_TESTS(float16, LIBC_NAMESPACE::floorf16)
+LIST_FLOOR_TESTS(Floorf16, float16, LIBC_NAMESPACE::floorf16)
diff --git a/libc/test/src/math/floorf_test.cpp b/libc/test/src/math/floorf_test.cpp
index cbb11f36f58da..155e7430bee1c 100644
--- a/libc/test/src/math/floorf_test.cpp
+++ b/libc/test/src/math/floorf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorf.h"
 
-LIST_FLOOR_TESTS(float, LIBC_NAMESPACE::floorf)
+LIST_FLOOR_TESTS(Floorf, float, LIBC_NAMESPACE::floorf)
diff --git a/libc/test/src/math/floorl_test.cpp b/libc/test/src/math/floorl_test.cpp
index 26f6a7703ed0f..4ef604b413d0c 100644
--- a/libc/test/src/math/floorl_test.cpp
+++ b/libc/test/src/math/floorl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorl.h"
 
-LIST_FLOOR_TESTS(long double, LIBC_NAMESPACE::floorl)
+LIST_FLOOR_TESTS(Floorl, long double, LIBC_NAMESPACE::floorl)
diff --git a/libc/test/src/math/fmaf16_test.cpp b/libc/test/src/math/fmaf16_test.cpp
index 233d3a7c54cf4..a6923a91dc330 100644
--- a/libc/test/src/math/fmaf16_test.cpp
+++ b/libc/test/src/math/fmaf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaf16.h"
 
-LIST_FMA_TESTS(float16, LIBC_NAMESPACE::fmaf16)
+LIST_FMA_TESTS(Fmaf16, float16, LIBC_NAMESPACE::fmaf16)
diff --git a/libc/test/src/math/fmaf_test.cpp b/libc/test/src/math/fmaf_test.cpp
index 09e9c504b942a..ae62bdb8192f1 100644
--- a/libc/test/src/math/fmaf_test.cpp
+++ b/libc/test/src/math/fmaf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaf.h"
 
-LIST_FMA_TESTS(float, LIBC_NAMESPACE::fmaf)
+LIST_FMA_TESTS(Fmaf, float, LIBC_NAMESPACE::fmaf)
diff --git a/libc/test/src/math/fmax_test.cpp b/libc/test/src/math/fmax_test.cpp
index 6800939625ebc..deb3516e85d86 100644
--- a/libc/test/src/math/fmax_test.cpp
+++ b/libc/test/src/math/fmax_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmax.h"
 
-LIST_FMAX_TESTS(double, LIBC_NAMESPACE::fmax)
+LIST_FMAX_TESTS(Fmax, double, LIBC_NAMESPACE::fmax)
diff --git a/libc/test/src/math/fmaxf_test.cpp b/libc/test/src/math/fmaxf_test.cpp
index 25c6f7339e8c9..b6a359c3e7f95 100644
--- a/libc/test/src/math/fmaxf_test.cpp
+++ b/libc/test/src/math/fmaxf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaxf.h"
 
-LIST_FMAX_TESTS(float, LIBC_NAMESPACE::fmaxf)
+LIST_FMAX_TESTS(Fmaxf, float, LIBC_NAMESPACE::fmaxf)
diff --git a/libc/test/src/math/fmaxl_test.cpp b/libc/test/src/math/fmaxl_test.cpp
index 9ac986c00012a..43ba72817dfb5 100644
--- a/libc/test/src/math/fmaxl_test.cpp
+++ b/libc/test/src/math/fmaxl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaxl.h"
 
-LIST_FMAX_TESTS(long double, LIBC_NAMESPACE::fmaxl)
+LIST_FMAX_TESTS(Fmaxl, long double, LIBC_NAMESPACE::fmaxl)
diff --git a/libc/test/src/math/fmin_test.cpp b/libc/test/src/math/fmin_test.cpp
index 5d241519021d4..02611cabffbb5 100644
--- a/libc/test/src/math/fmin_test.cpp
+++ b/libc/test/src/math/fmin_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmin.h"
 
-LIST_FMIN_TESTS(double, LIBC_NAMESPACE::fmin)
+LIST_FMIN_TESTS(Fmin, double, LIBC_NAMESPACE::fmin)
diff --git a/libc/test/src/math/fminf_test.cpp b/libc/test/src/math/fminf_test.cpp
index 1af5b79155b1d..7d03026137fcf 100644
--- a/libc/test/src/math/fminf_test.cpp
+++ b/libc/test/src/math/fminf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminf.h"
 
-LIST_FMIN_TESTS(float, LIBC_NAMESPACE::fminf)
+LIST_FMIN_TESTS(Fminf, float, LIBC_NAMESPACE::fminf)
diff --git a/libc/test/src/math/fminl_test.cpp b/libc/test/src/math/fminl_test.cpp
index 0791f8c4ad859..229c51cd1179c 100644
--- a/libc/test/src/math/fminl_test.cpp
+++ b/libc/test/src/math/fminl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminl.h"
 
-LIST_FMIN_TESTS(long double, LIBC_NAMESPACE::fminl)
+LIST_FMIN_TESTS(Fminl, long double, LIBC_NAMESPACE::fminl)
diff --git a/libc/test/src/math/fmod_test.cpp b/libc/test/src/math/fmod_test.cpp
index ec39e0567a7ca..4482ccaaa7517 100644
--- a/libc/test/src/math/fmod_test.cpp
+++ b/libc/test/src/math/fmod_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmod.h"
 
-LIST_FMOD_TESTS(double, LIBC_NAMESPACE::fmod)
+LIST_FMOD_TESTS(Fmod, double, LIBC_NAMESPACE::fmod)
diff --git a/libc/test/src/math/fmodf_test.cpp b/libc/test/src/math/fmodf_test.cpp
index 5c3c6286e88fe..fb2469de93388 100644
--- a/libc/test/src/math/fmodf_test.cpp
+++ b/libc/test/src/math/fmodf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmodf.h"
 
-LIST_FMOD_TESTS(float, LIBC_NAMESPACE::fmodf)
+LIST_FMOD_TESTS(Fmodf, float, LIBC_NAMESPACE::fmodf)
diff --git a/libc/test/src/math/fmul_test.cpp b/libc/test/src/math/fmul_test.cpp
index 488e087a32520..dbf5095f7c4dc 100644
--- a/libc/test/src/math/fmul_test.cpp
+++ b/libc/test/src/math/fmul_test.cpp
@@ -13,9 +13,9 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-LIST_MUL_TESTS(float, double, LIBC_NAMESPACE::fmul)
+LIST_MUL_TESTS(Fmul, float, double, LIBC_NAMESPACE::fmul)
 
-TEST_F(LlvmLibcMulTest, SpecialInputs) {
+TEST_F(LlvmLibcFmulTest, SpecialInputs) {
   namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
   double INPUTS[][2] = {
       {0x1.0100010002p8, 0x1.fffcp14},
diff --git a/libc/test/src/math/fmull_test.cpp b/libc/test/src/math/fmull_test.cpp
index ef694063f20dc..82101fd5b84ee 100644
--- a/libc/test/src/math/fmull_test.cpp
+++ b/libc/test/src/math/fmull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmull.h"
 
-LIST_MUL_TESTS(float, long double, LIBC_NAMESPACE::fmull)
+LIST_MUL_TESTS(Fmull, float, long double, LIBC_NAMESPACE::fmull)
diff --git a/libc/test/src/math/frexp_test.cpp b/libc/test/src/math/frexp_test.cpp
index 4d078baffcb39..454612e4aff9b 100644
--- a/libc/test/src/math/frexp_test.cpp
+++ b/libc/test/src/math/frexp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexp.h"
 
-LIST_FREXP_TESTS(double, LIBC_NAMESPACE::frexp)
+LIST_FREXP_TESTS(Frexp, double, LIBC_NAMESPACE::frexp)
diff --git a/libc/test/src/math/frexpbf16_test.cpp b/libc/test/src/math/frexpbf16_test.cpp
index 913e3ac097c4d..58a80c7578e8a 100644
--- a/libc/test/src/math/frexpbf16_test.cpp
+++ b/libc/test/src/math/frexpbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/frexpbf16.h"
 
-LIST_FREXP_TESTS(bfloat16, LIBC_NAMESPACE::frexpbf16)
+LIST_FREXP_TESTS(Frexpbf16, bfloat16, LIBC_NAMESPACE::frexpbf16)
diff --git a/libc/test/src/math/frexpf16_test.cpp b/libc/test/src/math/frexpf16_test.cpp
index 6a31033949910..ee243d95edc77 100644
--- a/libc/test/src/math/frexpf16_test.cpp
+++ b/libc/test/src/math/frexpf16_test.cpp
@@ -15,4 +15,4 @@
 
 #include "src/math/frexpf16.h"
 
-LIST_FREXP_TESTS(float16, LIBC_NAMESPACE::frexpf16)
+LIST_FREXP_TESTS(Frexpf16, float16, LIBC_NAMESPACE::frexpf16)
diff --git a/libc/test/src/math/frexpf_test.cpp b/libc/test/src/math/frexpf_test.cpp
index 577eb9609cfcc..109e8e5bbef3a 100644
--- a/libc/test/src/math/frexpf_test.cpp
+++ b/libc/test/src/math/frexpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpf.h"
 
-LIST_FREXP_TESTS(float, LIBC_NAMESPACE::frexpf)
+LIST_FREXP_TESTS(Frexpf, float, LIBC_NAMESPACE::frexpf)
diff --git a/libc/test/src/math/frexpl_test.cpp b/libc/test/src/math/frexpl_test.cpp
index e5184cd225bcf..da051614022c3 100644
--- a/libc/test/src/math/frexpl_test.cpp
+++ b/libc/test/src/math/frexpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpl.h"
 
-LIST_FREXP_TESTS(long double, LIBC_NAMESPACE::frexpl)
+LIST_FREXP_TESTS(Frexpl, long double, LIBC_NAMESPACE::frexpl)
diff --git a/libc/test/src/math/fsqrt_test.cpp b/libc/test/src/math/fsqrt_test.cpp
index 8471e3c9365e9..c734b6a33cc7a 100644
--- a/libc/test/src/math/fsqrt_test.cpp
+++ b/libc/test/src/math/fsqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsqrt.h"
 
-LIST_NARROWING_SQRT_TESTS(float, double, LIBC_NAMESPACE::fsqrt)
+LIST_NARROWING_SQRT_TESTS(Fsqrt, float, double, LIBC_NAMESPACE::fsqrt)
diff --git a/libc/test/src/math/fsqrtl_test.cpp b/libc/test/src/math/fsqrtl_test.cpp
index 1082a33466857..af94d70b9fefb 100644
--- a/libc/test/src/math/fsqrtl_test.cpp
+++ b/libc/test/src/math/fsqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(float, long double, LIBC_NAMESPACE::fsqrtl)
+LIST_NARROWING_SQRT_TESTS(Fsqrtl, float, long double, LIBC_NAMESPACE::fsqrtl)
diff --git a/libc/test/src/math/fsub_test.cpp b/libc/test/src/math/fsub_test.cpp
index 3c825f7f28af4..0e7805cb67c3f 100644
--- a/libc/test/src/math/fsub_test.cpp
+++ b/libc/test/src/math/fsub_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsub.h"
 
-LIST_SUB_TESTS(float, double, LIBC_NAMESPACE::fsub)
+LIST_SUB_TESTS(Fsub, float, double, LIBC_NAMESPACE::fsub)
diff --git a/libc/test/src/math/fsubl_test.cpp b/libc/test/src/math/fsubl_test.cpp
index 8723432603b00..3a0e3e8683bad 100644
--- a/libc/test/src/math/fsubl_test.cpp
+++ b/libc/test/src/math/fsubl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsubl.h"
 
-LIST_SUB_TESTS(float, long double, LIBC_NAMESPACE::fsubl)
+LIST_SUB_TESTS(Fsubl, float, long double, LIBC_NAMESPACE::fsubl)
diff --git a/libc/test/src/math/generic_sqrt_test.cpp b/libc/test/src/math/generic_sqrt_test.cpp
index d0ab31ffd0fe6..4f26679525b31 100644
--- a/libc/test/src/math/generic_sqrt_test.cpp
+++ b/libc/test/src/math/generic_sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(double, LIBC_NAMESPACE::fputil::sqrt<double>)
+LIST_SQRT_TESTS(GenericSqrt, double, LIBC_NAMESPACE::fputil::sqrt<double>)
diff --git a/libc/test/src/math/generic_sqrtf_test.cpp b/libc/test/src/math/generic_sqrtf_test.cpp
index f22ac8829d5ac..f0477c4ecf157 100644
--- a/libc/test/src/math/generic_sqrtf_test.cpp
+++ b/libc/test/src/math/generic_sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(float, LIBC_NAMESPACE::fputil::sqrt<float>)
+LIST_SQRT_TESTS(GenericSqrtf, float, LIBC_NAMESPACE::fputil::sqrt<float>)
diff --git a/libc/test/src/math/generic_sqrtl_test.cpp b/libc/test/src/math/generic_sqrtl_test.cpp
index ddc6a23695be4..8db2b4489b8a8 100644
--- a/libc/test/src/math/generic_sqrtl_test.cpp
+++ b/libc/test/src/math/generic_sqrtl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(long double, LIBC_NAMESPACE::fputil::sqrt<long double>)
+LIST_SQRT_TESTS(GenericSqrtl, long double,
+                LIBC_NAMESPACE::fputil::sqrt<long double>)
diff --git a/libc/test/src/math/ldexp_test.cpp b/libc/test/src/math/ldexp_test.cpp
index aad580f95fb99..861aef0009204 100644
--- a/libc/test/src/math/ldexp_test.cpp
+++ b/libc/test/src/math/ldexp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexp.h"
 
-LIST_LDEXP_TESTS(double, LIBC_NAMESPACE::ldexp)
+LIST_LDEXP_TESTS(Ldexp, double, LIBC_NAMESPACE::ldexp)
diff --git a/libc/test/src/math/ldexpf_test.cpp b/libc/test/src/math/ldexpf_test.cpp
index f4cce37b9277d..721eeefc37e7d 100644
--- a/libc/test/src/math/ldexpf_test.cpp
+++ b/libc/test/src/math/ldexpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpf.h"
 
-LIST_LDEXP_TESTS(float, LIBC_NAMESPACE::ldexpf)
+LIST_LDEXP_TESTS(Ldexpf, float, LIBC_NAMESPACE::ldexpf)
diff --git a/libc/test/src/math/ldexpl_test.cpp b/libc/test/src/math/ldexpl_test.cpp
index 405e53390e8c3..b14acc3585fcc 100644
--- a/libc/test/src/math/ldexpl_test.cpp
+++ b/libc/test/src/math/ldexpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpl.h"
 
-LIST_LDEXP_TESTS(long double, LIBC_NAMESPACE::ldexpl)
+LIST_LDEXP_TESTS(Ldexpl, long double, LIBC_NAMESPACE::ldexpl)
diff --git a/libc/test/src/math/llrint_test.cpp b/libc/test/src/math/llrint_test.cpp
index 8cf7d92095891..689b5504e10b4 100644
--- a/libc/test/src/math/llrint_test.cpp
+++ b/libc/test/src/math/llrint_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrint.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(double, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrint, double, long long,
                                        LIBC_NAMESPACE::llrint)
diff --git a/libc/test/src/math/llrintbf16_test.cpp b/libc/test/src/math/llrintbf16_test.cpp
index e841e627e2634..1d8d392673c49 100644
--- a/libc/test/src/math/llrintbf16_test.cpp
+++ b/libc/test/src/math/llrintbf16_test.cpp
@@ -11,5 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/llrintbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(bfloat16, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintbf16, bfloat16, long long,
                                        LIBC_NAMESPACE::llrintbf16)
diff --git a/libc/test/src/math/llrintf16_test.cpp b/libc/test/src/math/llrintf16_test.cpp
index d16bd8f38b052..3f13426d4d9b9 100644
--- a/libc/test/src/math/llrintf16_test.cpp
+++ b/libc/test/src/math/llrintf16_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float16, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintf16, float16, long long,
                                        LIBC_NAMESPACE::llrintf16)
diff --git a/libc/test/src/math/llrintf_test.cpp b/libc/test/src/math/llrintf_test.cpp
index 0d9d3c4111bb2..dd9e94e446c17 100644
--- a/libc/test/src/math/llrintf_test.cpp
+++ b/libc/test/src/math/llrintf_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintf, float, long long,
                                        LIBC_NAMESPACE::llrintf)
diff --git a/libc/test/src/math/llrintl_test.cpp b/libc/test/src/math/llrintl_test.cpp
index 1ceb9fecc4039..76fb34ec871d4 100644
--- a/libc/test/src/math/llrintl_test.cpp
+++ b/libc/test/src/math/llrintl_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(long double, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintl, long double, long long,
                                        LIBC_NAMESPACE::llrintl)
diff --git a/libc/test/src/math/llround_test.cpp b/libc/test/src/math/llround_test.cpp
index bda2fca6e8659..f66a7e90c1ff5 100644
--- a/libc/test/src/math/llround_test.cpp
+++ b/libc/test/src/math/llround_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llround.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(double, long long, LIBC_NAMESPACE::llround)
+LIST_ROUND_TO_INTEGER_TESTS(Llround, double, long long, LIBC_NAMESPACE::llround)
diff --git a/libc/test/src/math/llroundbf16_test.cpp b/libc/test/src/math/llroundbf16_test.cpp
index c3b7ea43c3e8a..8ea8b879a56c9 100644
--- a/libc/test/src/math/llroundbf16_test.cpp
+++ b/libc/test/src/math/llroundbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/llroundbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(bfloat16, long long, LIBC_NAMESPACE::llroundbf16)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundbf16, bfloat16, long long,
+                            LIBC_NAMESPACE::llroundbf16)
diff --git a/libc/test/src/math/llroundf16_test.cpp b/libc/test/src/math/llroundf16_test.cpp
index 9342b24fd5d04..b89bc78e6712d 100644
--- a/libc/test/src/math/llroundf16_test.cpp
+++ b/libc/test/src/math/llroundf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float16, long long, LIBC_NAMESPACE::llroundf16)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundf16, float16, long long,
+                            LIBC_NAMESPACE::llroundf16)
diff --git a/libc/test/src/math/llroundf_test.cpp b/libc/test/src/math/llroundf_test.cpp
index a35b5fabbac34..3d87e3bc7c188 100644
--- a/libc/test/src/math/llroundf_test.cpp
+++ b/libc/test/src/math/llroundf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float, long long, LIBC_NAMESPACE::llroundf)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundf, float, long long,
+                            LIBC_NAMESPACE::llroundf)
diff --git a/libc/test/src/math/llroundl_test.cpp b/libc/test/src/math/llroundl_test.cpp
index e43d49f4cbe1b..ff5027825366b 100644
--- a/libc/test/src/math/llroundl_test.cpp
+++ b/libc/test/src/math/llroundl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(long double, long long, LIBC_NAMESPACE::llroundl)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundl, long double, long long,
+                            LIBC_NAMESPACE::llroundl)
diff --git a/libc/test/src/math/logb_test.cpp b/libc/test/src/math/logb_test.cpp
index 2dc56c2e613cc..01a2a3bd9dfba 100644
--- a/libc/test/src/math/logb_test.cpp
+++ b/libc/test/src/math/logb_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logb.h"
 
-LIST_LOGB_TESTS(double, LIBC_NAMESPACE::logb)
+LIST_LOGB_TESTS(Logb, double, LIBC_NAMESPACE::logb)
diff --git a/libc/test/src/math/logbf_test.cpp b/libc/test/src/math/logbf_test.cpp
index c25485ca78b06..71890487340b6 100644
--- a/libc/test/src/math/logbf_test.cpp
+++ b/libc/test/src/math/logbf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbf.h"
 
-LIST_LOGB_TESTS(float, LIBC_NAMESPACE::logbf)
+LIST_LOGB_TESTS(Logbf, float, LIBC_NAMESPACE::logbf)
diff --git a/libc/test/src/math/logbl_test.cpp b/libc/test/src/math/logbl_test.cpp
index b26cee65783c4..d17719c304aea 100644
--- a/libc/test/src/math/logbl_test.cpp
+++ b/libc/test/src/math/logbl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbl.h"
 
-LIST_LOGB_TESTS(long double, LIBC_NAMESPACE::logbl)
+LIST_LOGB_TESTS(Logbl, long double, LIBC_NAMESPACE::logbl)
diff --git a/libc/test/src/math/lrint_test.cpp b/libc/test/src/math/lrint_test.cpp
index 9cff266122536..274e8145ab9c5 100644
--- a/libc/test/src/math/lrint_test.cpp
+++ b/libc/test/src/math/lrint_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrint.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(double, long, LIBC_NAMESPACE::lrint)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrint, double, long,
+                                       LIBC_NAMESPACE::lrint)
diff --git a/libc/test/src/math/lrintbf16_test.cpp b/libc/test/src/math/lrintbf16_test.cpp
index 65a5633b81723..b2523263297ba 100644
--- a/libc/test/src/math/lrintbf16_test.cpp
+++ b/libc/test/src/math/lrintbf16_test.cpp
@@ -11,5 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/lrintbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(bfloat16, long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintbf16, bfloat16, long,
                                        LIBC_NAMESPACE::lrintbf16)
diff --git a/libc/test/src/math/lrintf16_test.cpp b/libc/test/src/math/lrintf16_test.cpp
index 28b1a1cb888d7..17542a05dfec2 100644
--- a/libc/test/src/math/lrintf16_test.cpp
+++ b/libc/test/src/math/lrintf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrintf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float16, long, LIBC_NAMESPACE::lrintf16)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintf16, float16, long,
+                                       LIBC_NAMESPACE::lrintf16)
diff --git a/libc/test/src/math/lrintf_test.cpp b/libc/test/src/math/lrintf_test.cpp
index 9c696a39e6928..97bde3563db15 100644
--- a/libc/test/src/math/lrintf_test.cpp
+++ b/libc/test/src/math/lrintf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrintf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float, long, LIBC_NAMESPACE::lrintf)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintf, float, long,
+                                       LIBC_NAMESPACE::lrintf)
diff --git a/libc/test/src/math/lrintl_test.cpp b/libc/test/src/math/lrintl_test.cpp
index e44dd30d2c6cc..0c01d56d67e89 100644
--- a/libc/test/src/math/lrintl_test.cpp
+++ b/libc/test/src/math/lrintl_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/lrintl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(long double, long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintl, long double, long,
                                        LIBC_NAMESPACE::lrintl)
diff --git a/libc/test/src/math/lround_test.cpp b/libc/test/src/math/lround_test.cpp
index 1fb2fc71e20cc..31990a30d1f49 100644
--- a/libc/test/src/math/lround_test.cpp
+++ b/libc/test/src/math/lround_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lround.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(double, long, LIBC_NAMESPACE::lround)
+LIST_ROUND_TO_INTEGER_TESTS(Lround, double, long, LIBC_NAMESPACE::lround)
diff --git a/libc/test/src/math/lroundbf16_test.cpp b/libc/test/src/math/lroundbf16_test.cpp
index 2f2b7b1a71b36..1c77c0fe8707b 100644
--- a/libc/test/src/math/lroundbf16_test.cpp
+++ b/libc/test/src/math/lroundbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/lroundbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(bfloat16, long, LIBC_NAMESPACE::lroundbf16)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundbf16, bfloat16, long,
+                            LIBC_NAMESPACE::lroundbf16)
diff --git a/libc/test/src/math/lroundf16_test.cpp b/libc/test/src/math/lroundf16_test.cpp
index 3077134d58f91..bf3d432a032f7 100644
--- a/libc/test/src/math/lroundf16_test.cpp
+++ b/libc/test/src/math/lroundf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float16, long, LIBC_NAMESPACE::lroundf16)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundf16, float16, long, LIBC_NAMESPACE::lroundf16)
diff --git a/libc/test/src/math/lroundf_test.cpp b/libc/test/src/math/lroundf_test.cpp
index 38fe5c7d1a52d..0c1b7f06944dd 100644
--- a/libc/test/src/math/lroundf_test.cpp
+++ b/libc/test/src/math/lroundf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float, long, LIBC_NAMESPACE::lroundf)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundf, float, long, LIBC_NAMESPACE::lroundf)
diff --git a/libc/test/src/math/lroundl_test.cpp b/libc/test/src/math/lroundl_test.cpp
index 8a29ba95a6173..999abf616b964 100644
--- a/libc/test/src/math/lroundl_test.cpp
+++ b/libc/test/src/math/lroundl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(long double, long, LIBC_NAMESPACE::lroundl)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundl, long double, long, LIBC_NAMESPACE::lroundl)
diff --git a/libc/test/src/math/modf_test.cpp b/libc/test/src/math/modf_test.cpp
index b4b03bad848de..144ad3478346a 100644
--- a/libc/test/src/math/modf_test.cpp
+++ b/libc/test/src/math/modf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modf.h"
 
-LIST_MODF_TESTS(double, LIBC_NAMESPACE::modf)
+LIST_MODF_TESTS(Modf, double, LIBC_NAMESPACE::modf)
diff --git a/libc/test/src/math/modff_test.cpp b/libc/test/src/math/modff_test.cpp
index 068dbc3f53135..c96475ee21503 100644
--- a/libc/test/src/math/modff_test.cpp
+++ b/libc/test/src/math/modff_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modff.h"
 
-LIST_MODF_TESTS(float, LIBC_NAMESPACE::modff)
+LIST_MODF_TESTS(Modff, float, LIBC_NAMESPACE::modff)
diff --git a/libc/test/src/math/modfl_test.cpp b/libc/test/src/math/modfl_test.cpp
index ae8a72642c587..cc1fea47022c2 100644
--- a/libc/test/src/math/modfl_test.cpp
+++ b/libc/test/src/math/modfl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modfl.h"
 
-LIST_MODF_TESTS(long double, LIBC_NAMESPACE::modfl)
+LIST_MODF_TESTS(Modfl, long double, LIBC_NAMESPACE::modfl)
diff --git a/libc/test/src/math/nearbyint_test.cpp b/libc/test/src/math/nearbyint_test.cpp
index 11a5c3372e73e..64d93baa89b5b 100644
--- a/libc/test/src/math/nearbyint_test.cpp
+++ b/libc/test/src/math/nearbyint_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyint.h"
 
-LIST_NEARBYINT_TESTS(double, LIBC_NAMESPACE::nearbyint)
+LIST_NEARBYINT_TESTS(Nearbyint, double, LIBC_NAMESPACE::nearbyint)
diff --git a/libc/test/src/math/nearbyintbf16_test.cpp b/libc/test/src/math/nearbyintbf16_test.cpp
index 2d64fc5a154ee..ba57972c35ee5 100644
--- a/libc/test/src/math/nearbyintbf16_test.cpp
+++ b/libc/test/src/math/nearbyintbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nearbyintbf16.h"
 
-LIST_NEARBYINT_TESTS(bfloat16, LIBC_NAMESPACE::nearbyintbf16)
+LIST_NEARBYINT_TESTS(Nearbyintbf16, bfloat16, LIBC_NAMESPACE::nearbyintbf16)
diff --git a/libc/test/src/math/nearbyintf16_test.cpp b/libc/test/src/math/nearbyintf16_test.cpp
index e6ec250cec91f..60f1ee602701a 100644
--- a/libc/test/src/math/nearbyintf16_test.cpp
+++ b/libc/test/src/math/nearbyintf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintf16.h"
 
-LIST_NEARBYINT_TESTS(float16, LIBC_NAMESPACE::nearbyintf16)
+LIST_NEARBYINT_TESTS(Nearbyintf16, float16, LIBC_NAMESPACE::nearbyintf16)
diff --git a/libc/test/src/math/nearbyintf_test.cpp b/libc/test/src/math/nearbyintf_test.cpp
index fd26153cfffb9..0fb9f35a5262d 100644
--- a/libc/test/src/math/nearbyintf_test.cpp
+++ b/libc/test/src/math/nearbyintf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintf.h"
 
-LIST_NEARBYINT_TESTS(float, LIBC_NAMESPACE::nearbyintf)
+LIST_NEARBYINT_TESTS(Nearbyintf, float, LIBC_NAMESPACE::nearbyintf)
diff --git a/libc/test/src/math/nearbyintl_test.cpp b/libc/test/src/math/nearbyintl_test.cpp
index a6d81a1439e17..3c760a42151a2 100644
--- a/libc/test/src/math/nearbyintl_test.cpp
+++ b/libc/test/src/math/nearbyintl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintl.h"
 
-LIST_NEARBYINT_TESTS(long double, LIBC_NAMESPACE::nearbyintl)
+LIST_NEARBYINT_TESTS(Nearbyintl, long double, LIBC_NAMESPACE::nearbyintl)
diff --git a/libc/test/src/math/nextafter_test.cpp b/libc/test/src/math/nextafter_test.cpp
index 998b19fb1dccd..21f8c7209057f 100644
--- a/libc/test/src/math/nextafter_test.cpp
+++ b/libc/test/src/math/nextafter_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafter.h"
 
-LIST_NEXTAFTER_TESTS(double, LIBC_NAMESPACE::nextafter)
+LIST_NEXTAFTER_TESTS(Nextafter, double, LIBC_NAMESPACE::nextafter)
diff --git a/libc/test/src/math/nextafterf128_test.cpp b/libc/test/src/math/nextafterf128_test.cpp
index a8d000ff4de38..efe2e8b4d5269 100644
--- a/libc/test/src/math/nextafterf128_test.cpp
+++ b/libc/test/src/math/nextafterf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterf128.h"
 
-LIST_NEXTAFTER_TESTS(float128, LIBC_NAMESPACE::nextafterf128)
+LIST_NEXTAFTER_TESTS(Nextafterf128, float128, LIBC_NAMESPACE::nextafterf128)
diff --git a/libc/test/src/math/nextafterf_test.cpp b/libc/test/src/math/nextafterf_test.cpp
index 31770bc591ec1..99a65b559db78 100644
--- a/libc/test/src/math/nextafterf_test.cpp
+++ b/libc/test/src/math/nextafterf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterf.h"
 
-LIST_NEXTAFTER_TESTS(float, LIBC_NAMESPACE::nextafterf)
+LIST_NEXTAFTER_TESTS(Nextafterf, float, LIBC_NAMESPACE::nextafterf)
diff --git a/libc/test/src/math/nextafterl_test.cpp b/libc/test/src/math/nextafterl_test.cpp
index 4c8577f2690a1..2d750c947f726 100644
--- a/libc/test/src/math/nextafterl_test.cpp
+++ b/libc/test/src/math/nextafterl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterl.h"
 
-LIST_NEXTAFTER_TESTS(long double, LIBC_NAMESPACE::nextafterl)
+LIST_NEXTAFTER_TESTS(Nextafterl, long double, LIBC_NAMESPACE::nextafterl)
diff --git a/libc/test/src/math/remquo_test.cpp b/libc/test/src/math/remquo_test.cpp
index 4358331a8f76e..0747fc9cae5ab 100644
--- a/libc/test/src/math/remquo_test.cpp
+++ b/libc/test/src/math/remquo_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquo.h"
 
-LIST_REMQUO_TESTS(double, LIBC_NAMESPACE::remquo)
+LIST_REMQUO_TESTS(Remquo, double, LIBC_NAMESPACE::remquo)
diff --git a/libc/test/src/math/remquobf16_test.cpp b/libc/test/src/math/remquobf16_test.cpp
index 2c5ad5a7e2770..7fc5396568fa4 100644
--- a/libc/test/src/math/remquobf16_test.cpp
+++ b/libc/test/src/math/remquobf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/remquobf16.h"
 
-LIST_REMQUO_TESTS(bfloat16, LIBC_NAMESPACE::remquobf16)
+LIST_REMQUO_TESTS(Remquobf16, bfloat16, LIBC_NAMESPACE::remquobf16)
diff --git a/libc/test/src/math/remquof16_test.cpp b/libc/test/src/math/remquof16_test.cpp
index 33b98fa3d38e1..19bc69e92c0b9 100644
--- a/libc/test/src/math/remquof16_test.cpp
+++ b/libc/test/src/math/remquof16_test.cpp
@@ -15,4 +15,4 @@
 
 #include "src/math/remquof16.h"
 
-LIST_REMQUO_TESTS(float16, LIBC_NAMESPACE::remquof16)
+LIST_REMQUO_TESTS(Remquof16, float16, LIBC_NAMESPACE::remquof16)
diff --git a/libc/test/src/math/remquof_test.cpp b/libc/test/src/math/remquof_test.cpp
index 590b4ffb4595f..b5bd41e240f10 100644
--- a/libc/test/src/math/remquof_test.cpp
+++ b/libc/test/src/math/remquof_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquof.h"
 
-LIST_REMQUO_TESTS(float, LIBC_NAMESPACE::remquof)
+LIST_REMQUO_TESTS(Remquof, float, LIBC_NAMESPACE::remquof)
diff --git a/libc/test/src/math/remquol_test.cpp b/libc/test/src/math/remquol_test.cpp
index ae2db44930410..9da70f2309f8e 100644
--- a/libc/test/src/math/remquol_test.cpp
+++ b/libc/test/src/math/remquol_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquol.h"
 
-LIST_REMQUO_TESTS(long double, LIBC_NAMESPACE::remquol)
+LIST_REMQUO_TESTS(Remquol, long double, LIBC_NAMESPACE::remquol)
diff --git a/libc/test/src/math/rint_test.cpp b/libc/test/src/math/rint_test.cpp
index 9c89b7acec56d..5da6398511b0c 100644
--- a/libc/test/src/math/rint_test.cpp
+++ b/libc/test/src/math/rint_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rint.h"
 
-LIST_RINT_TESTS(double, LIBC_NAMESPACE::rint)
+LIST_RINT_TESTS(Rint, double, LIBC_NAMESPACE::rint)
diff --git a/libc/test/src/math/rintbf16_test.cpp b/libc/test/src/math/rintbf16_test.cpp
index c78dcf6a31560..60e76777c8d39 100644
--- a/libc/test/src/math/rintbf16_test.cpp
+++ b/libc/test/src/math/rintbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/rintbf16.h"
 
-LIST_RINT_TESTS(bfloat16, LIBC_NAMESPACE::rintbf16)
+LIST_RINT_TESTS(Rintbf16, bfloat16, LIBC_NAMESPACE::rintbf16)
diff --git a/libc/test/src/math/rintf16_test.cpp b/libc/test/src/math/rintf16_test.cpp
index 2adf2560bae1f..d8922a27383fd 100644
--- a/libc/test/src/math/rintf16_test.cpp
+++ b/libc/test/src/math/rintf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintf16.h"
 
-LIST_RINT_TESTS(float16, LIBC_NAMESPACE::rintf16)
+LIST_RINT_TESTS(Rintf16, float16, LIBC_NAMESPACE::rintf16)
diff --git a/libc/test/src/math/rintf_test.cpp b/libc/test/src/math/rintf_test.cpp
index f875bab2556ca..e40006780874f 100644
--- a/libc/test/src/math/rintf_test.cpp
+++ b/libc/test/src/math/rintf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintf.h"
 
-LIST_RINT_TESTS(float, LIBC_NAMESPACE::rintf)
+LIST_RINT_TESTS(Rintf, float, LIBC_NAMESPACE::rintf)
diff --git a/libc/test/src/math/rintl_test.cpp b/libc/test/src/math/rintl_test.cpp
index 458ca05a985af..dd04f008db7f8 100644
--- a/libc/test/src/math/rintl_test.cpp
+++ b/libc/test/src/math/rintl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintl.h"
 
-LIST_RINT_TESTS(long double, LIBC_NAMESPACE::rintl)
+LIST_RINT_TESTS(Rintl, long double, LIBC_NAMESPACE::rintl)
diff --git a/libc/test/src/math/round_test.cpp b/libc/test/src/math/round_test.cpp
index dbcb56717e208..5855efb28f494 100644
--- a/libc/test/src/math/round_test.cpp
+++ b/libc/test/src/math/round_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/round.h"
 
-LIST_ROUND_TESTS(double, LIBC_NAMESPACE::round)
+LIST_ROUND_TESTS(Round, double, LIBC_NAMESPACE::round)
diff --git a/libc/test/src/math/roundbf16_test.cpp b/libc/test/src/math/roundbf16_test.cpp
index 2ee44fdbcc505..8cc615e9e1c7f 100644
--- a/libc/test/src/math/roundbf16_test.cpp
+++ b/libc/test/src/math/roundbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/roundbf16.h"
 
-LIST_ROUND_TESTS(bfloat16, LIBC_NAMESPACE::roundbf16)
+LIST_ROUND_TESTS(Roundbf16, bfloat16, LIBC_NAMESPACE::roundbf16)
diff --git a/libc/test/src/math/roundeven_test.cpp b/libc/test/src/math/roundeven_test.cpp
index cd1a7bf2429fb..19d40204bfd5c 100644
--- a/libc/test/src/math/roundeven_test.cpp
+++ b/libc/test/src/math/roundeven_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundeven.h"
 
-LIST_ROUNDEVEN_TESTS(double, LIBC_NAMESPACE::roundeven)
+LIST_ROUNDEVEN_TESTS(Roundeven, double, LIBC_NAMESPACE::roundeven)
diff --git a/libc/test/src/math/roundevenbf16_test.cpp b/libc/test/src/math/roundevenbf16_test.cpp
index ad73ee518fead..5c855e61c40bd 100644
--- a/libc/test/src/math/roundevenbf16_test.cpp
+++ b/libc/test/src/math/roundevenbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/roundevenbf16.h"
 
-LIST_ROUNDEVEN_TESTS(bfloat16, LIBC_NAMESPACE::roundevenbf16)
+LIST_ROUNDEVEN_TESTS(Roundevenbf16, bfloat16, LIBC_NAMESPACE::roundevenbf16)
diff --git a/libc/test/src/math/roundevenf16_test.cpp b/libc/test/src/math/roundevenf16_test.cpp
index 911a32c9f73f4..d70f5f4d8c26c 100644
--- a/libc/test/src/math/roundevenf16_test.cpp
+++ b/libc/test/src/math/roundevenf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundevenf16.h"
 
-LIST_ROUNDEVEN_TESTS(float16, LIBC_NAMESPACE::roundevenf16)
+LIST_ROUNDEVEN_TESTS(Roundevenf16, float16, LIBC_NAMESPACE::roundevenf16)
diff --git a/libc/test/src/math/roundevenf_test.cpp b/libc/test/src/math/roundevenf_test.cpp
index 68dff9b3eca9d..f7eb04d08aa73 100644
--- a/libc/test/src/math/roundevenf_test.cpp
+++ b/libc/test/src/math/roundevenf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundevenf.h"
 
-LIST_ROUNDEVEN_TESTS(float, LIBC_NAMESPACE::roundevenf)
+LIST_ROUNDEVEN_TESTS(Roundevenf, float, LIBC_NAMESPACE::roundevenf)
diff --git a/libc/test/src/math/roundevenl_test.cpp b/libc/test/src/math/roundevenl_test.cpp
index f4031bd65ec21..24e4923685e86 100644
--- a/libc/test/src/math/roundevenl_test.cpp
+++ b/libc/test/src/math/roundevenl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundevenl.h"
 
-LIST_ROUNDEVEN_TESTS(long double, LIBC_NAMESPACE::roundevenl)
+LIST_ROUNDEVEN_TESTS(Roundevenl, long double, LIBC_NAMESPACE::roundevenl)
diff --git a/libc/test/src/math/roundf128_test.cpp b/libc/test/src/math/roundf128_test.cpp
index 6b926b6b24691..1d9ccba7dd553 100644
--- a/libc/test/src/math/roundf128_test.cpp
+++ b/libc/test/src/math/roundf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TESTS(float128, LIBC_NAMESPACE::roundf128)
+LIST_ROUND_TESTS(Roundf128, float128, LIBC_NAMESPACE::roundf128)
diff --git a/libc/test/src/math/roundf16_test.cpp b/libc/test/src/math/roundf16_test.cpp
index 54ead855934db..ceca7be084f43 100644
--- a/libc/test/src/math/roundf16_test.cpp
+++ b/libc/test/src/math/roundf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundf16.h"
 
-LIST_ROUND_TESTS(float16, LIBC_NAMESPACE::roundf16)
+LIST_ROUND_TESTS(Roundf16, float16, LIBC_NAMESPACE::roundf16)
diff --git a/libc/test/src/math/roundf_test.cpp b/libc/test/src/math/roundf_test.cpp
index 053596a16e22f..026b322a8d4c7 100644
--- a/libc/test/src/math/roundf_test.cpp
+++ b/libc/test/src/math/roundf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundf.h"
 
-LIST_ROUND_TESTS(float, LIBC_NAMESPACE::roundf)
+LIST_ROUND_TESTS(Roundf, float, LIBC_NAMESPACE::roundf)
diff --git a/libc/test/src/math/roundl_test.cpp b/libc/test/src/math/roundl_test.cpp
index 2a2a213a8181c..f323b2ecce15e 100644
--- a/libc/test/src/math/roundl_test.cpp
+++ b/libc/test/src/math/roundl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundl.h"
 
-LIST_ROUND_TESTS(long double, LIBC_NAMESPACE::roundl)
+LIST_ROUND_TESTS(Roundl, long double, LIBC_NAMESPACE::roundl)
diff --git a/libc/test/src/math/rsqrtf_test.cpp b/libc/test/src/math/rsqrtf_test.cpp
index 4e476c0be8d41..a44624be3cb28 100644
--- a/libc/test/src/math/rsqrtf_test.cpp
+++ b/libc/test/src/math/rsqrtf_test.cpp
@@ -9,4 +9,4 @@
 
 #include "src/math/rsqrtf.h"
 
-LIST_RSQRT_TESTS(float, LIBC_NAMESPACE::rsqrtf)
+LIST_RSQRT_TESTS(Rsqrtf, float, LIBC_NAMESPACE::rsqrtf)
diff --git a/libc/test/src/math/scalbn_test.cpp b/libc/test/src/math/scalbn_test.cpp
index 413a2395ca3c5..d1631ea6146ac 100644
--- a/libc/test/src/math/scalbn_test.cpp
+++ b/libc/test/src/math/scalbn_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbn.h"
 
-LIST_SCALBN_TESTS(double, LIBC_NAMESPACE::scalbn)
+LIST_SCALBN_TESTS(Scalbn, double, LIBC_NAMESPACE::scalbn)
diff --git a/libc/test/src/math/scalbnf128_test.cpp b/libc/test/src/math/scalbnf128_test.cpp
index dc259de211489..d9ebe02ad0072 100644
--- a/libc/test/src/math/scalbnf128_test.cpp
+++ b/libc/test/src/math/scalbnf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnf128.h"
 
-LIST_SCALBN_TESTS(float128, LIBC_NAMESPACE::scalbnf128)
+LIST_SCALBN_TESTS(Scalbnf128, float128, LIBC_NAMESPACE::scalbnf128)
diff --git a/libc/test/src/math/scalbnf_test.cpp b/libc/test/src/math/scalbnf_test.cpp
index e97781c2b2354..61ebaf87d6bb9 100644
--- a/libc/test/src/math/scalbnf_test.cpp
+++ b/libc/test/src/math/scalbnf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnf.h"
 
-LIST_SCALBN_TESTS(float, LIBC_NAMESPACE::scalbnf)
+LIST_SCALBN_TESTS(Scalbnf, float, LIBC_NAMESPACE::scalbnf)
diff --git a/libc/test/src/math/scalbnl_test.cpp b/libc/test/src/math/scalbnl_test.cpp
index b0e0053790902..b99da45cf44a6 100644
--- a/libc/test/src/math/scalbnl_test.cpp
+++ b/libc/test/src/math/scalbnl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnl.h"
 
-LIST_SCALBN_TESTS(long double, LIBC_NAMESPACE::scalbnl)
+LIST_SCALBN_TESTS(Scalbnl, long double, LIBC_NAMESPACE::scalbnl)
diff --git a/libc/test/src/math/smoke/AddTest.h b/libc/test/src/math/smoke/AddTest.h
index ac68d06366462..99cb025538f7d 100644
--- a/libc/test/src/math/smoke/AddTest.h
+++ b/libc/test/src/math/smoke/AddTest.h
@@ -171,17 +171,25 @@ class AddTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ADD_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcAddTest = AddTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcAddTest, SpecialNumbers) { test_special_numbers(&func); }     \
-  TEST_F(LlvmLibcAddTest, InvalidOperations) {                                 \
+#define LIST_ADD_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = AddTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, InvalidOperations) {                            \
     test_invalid_operations(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcAddTest, RangeErrors) { test_range_errors(&func); }           \
-  TEST_F(LlvmLibcAddTest, InexactResults) { test_inexact_results(&func); }     \
-  TEST_F(LlvmLibcAddTest, MixedNormality) { test_mixed_normality(&func); }     \
-  TEST_F(LlvmLibcAddTest, MixedSigns) { test_mixed_signs(&func); }             \
-  TEST_F(LlvmLibcAddTest, SignedZeroResult) { test_signed_zero_result(&func); }
+  TEST_F(LlvmLibc##Name##Test, RangeErrors) { test_range_errors(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InexactResults) {                               \
+    test_inexact_results(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, MixedNormality) {                               \
+    test_mixed_normality(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, MixedSigns) { test_mixed_signs(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SignedZeroResult) {                             \
+    test_signed_zero_result(&func);                                            \
+  }
 
 #define LIST_ADD_SAME_TYPE_TESTS(suffix, OutType, InType, func)                \
   using LlvmLibcAddTest##suffix = AddTest<OutType, InType>;                    \
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index a61b854a85fb2..603998cd1c41c 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -3364,11 +3364,11 @@ add_fp_unittest(
   SUITE
     libc-math-smoke-tests
   SRCS
-    fminimum_numf16_test.cpp
+    fminimum_numbf16_test.cpp
   HDRS
-    FMaximumTest.h
+    FMinimumNumTest.h
   DEPENDS
-    libc.src.math.fminimum_numf16
+    libc.src.math.fminimum_numbf16
     libc.src.__support.CPP.algorithm
     libc.src.__support.FPUtil.bfloat16
     libc.src.__support.FPUtil.fp_bits
diff --git a/libc/test/src/math/smoke/CanonicalizeTest.h b/libc/test/src/math/smoke/CanonicalizeTest.h
index f44827b180a6c..fc7f9caf74671 100644
--- a/libc/test/src/math/smoke/CanonicalizeTest.h
+++ b/libc/test/src/math/smoke/CanonicalizeTest.h
@@ -266,18 +266,14 @@ class CanonicalizeTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_CANONICALIZE_TESTS(T, func)                                       \
-  using LlvmLibcCanonicalizeTest = CanonicalizeTest<T>;                        \
-  TEST_F(LlvmLibcCanonicalizeTest, SpecialNumbers) {                           \
-    testSpecialNumbers(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcCanonicalizeTest, RegularNubmers) {                           \
-    testRegularNumbers(&func);                                                 \
-  }
-
-#define X86_80_SPECIAL_CANONICALIZE_TEST(T, func)                              \
-  using LlvmLibcCanonicalizeTest = CanonicalizeTest<T>;                        \
-  TEST_F(LlvmLibcCanonicalizeTest, X64_80SpecialNumbers) {                     \
+#define LIST_CANONICALIZE_TESTS(Name, T, func)                                 \
+  using LlvmLibc##Name##Test = CanonicalizeTest<T>;                            \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RegularNumbers) { testRegularNumbers(&func); }
+
+#define X86_80_SPECIAL_CANONICALIZE_TEST(Name, T, func)                        \
+  using LlvmLibc##Name##Test = CanonicalizeTest<T>;                            \
+  TEST_F(LlvmLibc##Name##Test, X64_80SpecialNumbers) {                         \
     testX64_80SpecialNumbers(&func);                                           \
   }
 
diff --git a/libc/test/src/math/smoke/CeilTest.h b/libc/test/src/math/smoke/CeilTest.h
index 1839db97887c4..ecdd4d50a7a10 100644
--- a/libc/test/src/math/smoke/CeilTest.h
+++ b/libc/test/src/math/smoke/CeilTest.h
@@ -68,10 +68,10 @@ class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_CEIL_TESTS(T, func)                                               \
-  using LlvmLibcCeilTest = CeilTest<T>;                                        \
-  TEST_F(LlvmLibcCeilTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcCeilTest, RoundedNubmers) { testRoundedNumbers(&func); }      \
-  TEST_F(LlvmLibcCeilTest, Fractions) { testFractions(&func); }
+#define LIST_CEIL_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = CeilTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_CEILTEST_H
diff --git a/libc/test/src/math/smoke/CopySignTest.h b/libc/test/src/math/smoke/CopySignTest.h
index e3063a1f82710..f594939c7f01c 100644
--- a/libc/test/src/math/smoke/CopySignTest.h
+++ b/libc/test/src/math/smoke/CopySignTest.h
@@ -55,9 +55,9 @@ class CopySignTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_COPYSIGN_TESTS(T, func)                                           \
-  using LlvmLibcCopySignTest = CopySignTest<T>;                                \
-  TEST_F(LlvmLibcCopySignTest, SpecialNumbers) { testSpecialNumbers(&func); }  \
-  TEST_F(LlvmLibcCopySignTest, Range) { testRange(&func); }
+#define LIST_COPYSIGN_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = CopySignTest<T>;                                \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_COPYSIGNTEST_H
diff --git a/libc/test/src/math/smoke/DivTest.h b/libc/test/src/math/smoke/DivTest.h
index a911ba8b72224..ebce775d9eabd 100644
--- a/libc/test/src/math/smoke/DivTest.h
+++ b/libc/test/src/math/smoke/DivTest.h
@@ -152,14 +152,18 @@ class DivTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_DIV_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcDivTest = DivTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcDivTest, SpecialNumbers) { test_special_numbers(&func); }     \
-  TEST_F(LlvmLibcDivTest, DivisionByZero) { test_division_by_zero(&func); }    \
-  TEST_F(LlvmLibcDivTest, InvalidOperations) {                                 \
+#define LIST_DIV_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = DivTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, DivisionByZero) {                               \
+    test_division_by_zero(&func);                                              \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, InvalidOperations) {                            \
     test_invalid_operations(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcDivTest, RangeErrors) { test_range_errors(&func); }           \
-  TEST_F(LlvmLibcDivTest, InexactResults) { test_inexact_results(&func); }
+  TEST_F(LlvmLibc##Name##Test, RangeErrors) { test_range_errors(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InexactResults) { test_inexact_results(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_DIVTEST_H
diff --git a/libc/test/src/math/smoke/FAbsTest.h b/libc/test/src/math/smoke/FAbsTest.h
index 048023b414299..c60e24d504020 100644
--- a/libc/test/src/math/smoke/FAbsTest.h
+++ b/libc/test/src/math/smoke/FAbsTest.h
@@ -37,8 +37,8 @@ class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FABS_TESTS(T, func)                                               \
-  using LlvmLibcFAbsTest = FAbsTest<T>;                                        \
-  TEST_F(LlvmLibcFAbsTest, SpecialNumbers) { testSpecialNumbers(&func); }
+#define LIST_FABS_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FAbsTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FABSTEST_H
diff --git a/libc/test/src/math/smoke/FDimTest.h b/libc/test/src/math/smoke/FDimTest.h
index 8c86b3d8231e3..28e73201189f2 100644
--- a/libc/test/src/math/smoke/FDimTest.h
+++ b/libc/test/src/math/smoke/FDimTest.h
@@ -86,11 +86,11 @@ class FDimTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FDIM_TESTS(T, func)                                               \
-  using LlvmLibcFDimTest = FDimTestTemplate<T>;                                \
-  TEST_F(LlvmLibcFDimTest, NaNArg) { test_nan_arg(&func); }                    \
-  TEST_F(LlvmLibcFDimTest, InfArg) { test_inf_arg(&func); }                    \
-  TEST_F(LlvmLibcFDimTest, NegInfArg) { test_neg_inf_arg(&func); }             \
-  TEST_F(LlvmLibcFDimTest, BothZero) { test_both_zero(&func); }                \
-  TEST_F(LlvmLibcFDimTest, InFloatRange) { test_in_range(&func); }             \
+#define LIST_FDIM_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FDimTestTemplate<T>;                            \
+  TEST_F(LlvmLibc##Name##Test, NaNArg) { test_nan_arg(&func); }                \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { test_inf_arg(&func); }                \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { test_neg_inf_arg(&func); }         \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { test_both_zero(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, InFloatRange) { test_in_range(&func); }         \
   static_assert(true, "Require semicolon.")
diff --git a/libc/test/src/math/smoke/FMaxTest.h b/libc/test/src/math/smoke/FMaxTest.h
index e05063dc23268..cc485a4044635 100644
--- a/libc/test/src/math/smoke/FMaxTest.h
+++ b/libc/test/src/math/smoke/FMaxTest.h
@@ -80,12 +80,12 @@ class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAX_TESTS(T, func)                                               \
-  using LlvmLibcFMaxTest = FMaxTest<T>;                                        \
-  TEST_F(LlvmLibcFMaxTest, NaN) { testNaN(&func); }                            \
-  TEST_F(LlvmLibcFMaxTest, InfArg) { testInfArg(&func); }                      \
-  TEST_F(LlvmLibcFMaxTest, NegInfArg) { testNegInfArg(&func); }                \
-  TEST_F(LlvmLibcFMaxTest, BothZero) { testBothZero(&func); }                  \
-  TEST_F(LlvmLibcFMaxTest, Range) { testRange(&func); }
+#define LIST_FMAX_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FMaxTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXTEST_H
diff --git a/libc/test/src/math/smoke/FMaximumMagNumTest.h b/libc/test/src/math/smoke/FMaximumMagNumTest.h
index 96f703cbd63ac..6a25a584157db 100644
--- a/libc/test/src/math/smoke/FMaximumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagNumTest.h
@@ -92,12 +92,12 @@ class FMaximumMagNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAXIMUM_MAG_NUM_TESTS(T, func)                                   \
-  using LlvmLibcFMaximumMagNumTest = FMaximumMagNumTest<T>;                    \
-  TEST_F(LlvmLibcFMaximumMagNumTest, NaN) { testNaN(&func); }                  \
-  TEST_F(LlvmLibcFMaximumMagNumTest, InfArg) { testInfArg(&func); }            \
-  TEST_F(LlvmLibcFMaximumMagNumTest, NegInfArg) { testNegInfArg(&func); }      \
-  TEST_F(LlvmLibcFMaximumMagNumTest, BothZero) { testBothZero(&func); }        \
-  TEST_F(LlvmLibcFMaximumMagNumTest, Range) { testRange(&func); }
+#define LIST_FMAXIMUM_MAG_NUM_TESTS(Name, T, func)                             \
+  using LlvmLibc##Name##Test = FMaximumMagNumTest<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMMAG_NUMTEST_H
diff --git a/libc/test/src/math/smoke/FMaximumMagTest.h b/libc/test/src/math/smoke/FMaximumMagTest.h
index 001501f311878..84edf7ee81421 100644
--- a/libc/test/src/math/smoke/FMaximumMagTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagTest.h
@@ -80,12 +80,12 @@ class FMaximumMagTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAXIMUM_MAG_TESTS(T, func)                                       \
-  using LlvmLibcFMaximumMagTest = FMaximumMagTest<T>;                          \
-  TEST_F(LlvmLibcFMaximumMagTest, NaN) { testNaN(&func); }                     \
-  TEST_F(LlvmLibcFMaximumMagTest, InfArg) { testInfArg(&func); }               \
-  TEST_F(LlvmLibcFMaximumMagTest, NegInfArg) { testNegInfArg(&func); }         \
-  TEST_F(LlvmLibcFMaximumMagTest, BothZero) { testBothZero(&func); }           \
-  TEST_F(LlvmLibcFMaximumMagTest, Range) { testRange(&func); }
+#define LIST_FMAXIMUM_MAG_TESTS(Name, T, func)                                 \
+  using LlvmLibc##Name##Test = FMaximumMagTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUM_MAGTEST_H
diff --git a/libc/test/src/math/smoke/FMaximumNumTest.h b/libc/test/src/math/smoke/FMaximumNumTest.h
index 49e74a3d58468..35839bad9c515 100644
--- a/libc/test/src/math/smoke/FMaximumNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumNumTest.h
@@ -91,12 +91,12 @@ class FMaximumNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAXIMUM_NUM_TESTS(T, func)                                       \
-  using LlvmLibcFMaximumNumTest = FMaximumNumTest<T>;                          \
-  TEST_F(LlvmLibcFMaximumNumTest, NaN) { testNaN(&func); }                     \
-  TEST_F(LlvmLibcFMaximumNumTest, InfArg) { testInfArg(&func); }               \
-  TEST_F(LlvmLibcFMaximumNumTest, NegInfArg) { testNegInfArg(&func); }         \
-  TEST_F(LlvmLibcFMaximumNumTest, BothZero) { testBothZero(&func); }           \
-  TEST_F(LlvmLibcFMaximumNumTest, Range) { testRange(&func); }
+#define LIST_FMAXIMUM_NUM_TESTS(Name, T, func)                                 \
+  using LlvmLibc##Name##Test = FMaximumNumTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMNUMTEST_H
diff --git a/libc/test/src/math/smoke/FMaximumTest.h b/libc/test/src/math/smoke/FMaximumTest.h
index d7efcd0869a86..2849a685498c9 100644
--- a/libc/test/src/math/smoke/FMaximumTest.h
+++ b/libc/test/src/math/smoke/FMaximumTest.h
@@ -79,12 +79,12 @@ class FMaximumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMAXIMUM_TESTS(T, func)                                           \
-  using LlvmLibcFMaximumTest = FMaximumTest<T>;                                \
-  TEST_F(LlvmLibcFMaximumTest, NaN) { testNaN(&func); }                        \
-  TEST_F(LlvmLibcFMaximumTest, InfArg) { testInfArg(&func); }                  \
-  TEST_F(LlvmLibcFMaximumTest, NegInfArg) { testNegInfArg(&func); }            \
-  TEST_F(LlvmLibcFMaximumTest, BothZero) { testBothZero(&func); }              \
-  TEST_F(LlvmLibcFMaximumTest, Range) { testRange(&func); }
+#define LIST_FMAXIMUM_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = FMaximumTest<T>;                                \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMTEST_H
diff --git a/libc/test/src/math/smoke/FMinTest.h b/libc/test/src/math/smoke/FMinTest.h
index e0dcabbddc356..30431834158a1 100644
--- a/libc/test/src/math/smoke/FMinTest.h
+++ b/libc/test/src/math/smoke/FMinTest.h
@@ -80,12 +80,12 @@ class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMIN_TESTS(T, func)                                               \
-  using LlvmLibcFMinTest = FMinTest<T>;                                        \
-  TEST_F(LlvmLibcFMinTest, NaN) { testNaN(&func); }                            \
-  TEST_F(LlvmLibcFMinTest, InfArg) { testInfArg(&func); }                      \
-  TEST_F(LlvmLibcFMinTest, NegInfArg) { testNegInfArg(&func); }                \
-  TEST_F(LlvmLibcFMinTest, BothZero) { testBothZero(&func); }                  \
-  TEST_F(LlvmLibcFMinTest, Range) { testRange(&func); }
+#define LIST_FMIN_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FMinTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINTEST_H
diff --git a/libc/test/src/math/smoke/FMinimumMagNumTest.h b/libc/test/src/math/smoke/FMinimumMagNumTest.h
index 6e504bfc94414..0dc694766e4e8 100644
--- a/libc/test/src/math/smoke/FMinimumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagNumTest.h
@@ -92,12 +92,12 @@ class FMinimumMagNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMINIMUM_MAG_NUM_TESTS(T, func)                                   \
-  using LlvmLibcFMinimumMagNumTest = FMinimumMagNumTest<T>;                    \
-  TEST_F(LlvmLibcFMinimumMagNumTest, NaN) { testNaN(&func); }                  \
-  TEST_F(LlvmLibcFMinimumMagNumTest, InfArg) { testInfArg(&func); }            \
-  TEST_F(LlvmLibcFMinimumMagNumTest, NegInfArg) { testNegInfArg(&func); }      \
-  TEST_F(LlvmLibcFMinimumMagNumTest, BothZero) { testBothZero(&func); }        \
-  TEST_F(LlvmLibcFMinimumMagNumTest, Range) { testRange(&func); }
+#define LIST_FMINIMUM_MAG_NUM_TESTS(Name, T, func)                             \
+  using LlvmLibc##Name##Test = FMinimumMagNumTest<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMMAG_NUMTEST_H
diff --git a/libc/test/src/math/smoke/FMinimumMagTest.h b/libc/test/src/math/smoke/FMinimumMagTest.h
index 4732fa1d26561..f2d1da18fd995 100644
--- a/libc/test/src/math/smoke/FMinimumMagTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagTest.h
@@ -80,12 +80,12 @@ class FMinimumMagTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMINIMUM_MAG_TESTS(T, func)                                       \
-  using LlvmLibcFMinimumMagTest = FMinimumMagTest<T>;                          \
-  TEST_F(LlvmLibcFMinimumMagTest, NaN) { testNaN(&func); }                     \
-  TEST_F(LlvmLibcFMinimumMagTest, InfArg) { testInfArg(&func); }               \
-  TEST_F(LlvmLibcFMinimumMagTest, NegInfArg) { testNegInfArg(&func); }         \
-  TEST_F(LlvmLibcFMinimumMagTest, BothZero) { testBothZero(&func); }           \
-  TEST_F(LlvmLibcFMinimumMagTest, Range) { testRange(&func); }
+#define LIST_FMINIMUM_MAG_TESTS(Name, T, func)                                 \
+  using LlvmLibc##Name##Test = FMinimumMagTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUM_MAGTEST_H
diff --git a/libc/test/src/math/smoke/FMinimumNumTest.h b/libc/test/src/math/smoke/FMinimumNumTest.h
index bad31b0c647f7..9450ebdf578c1 100644
--- a/libc/test/src/math/smoke/FMinimumNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumNumTest.h
@@ -91,12 +91,12 @@ class FMinimumNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMINIMUM_NUM_TESTS(T, func)                                       \
-  using LlvmLibcFMinimumNumTest = FMinimumNumTest<T>;                          \
-  TEST_F(LlvmLibcFMinimumNumTest, NaN) { testNaN(&func); }                     \
-  TEST_F(LlvmLibcFMinimumNumTest, InfArg) { testInfArg(&func); }               \
-  TEST_F(LlvmLibcFMinimumNumTest, NegInfArg) { testNegInfArg(&func); }         \
-  TEST_F(LlvmLibcFMinimumNumTest, BothZero) { testBothZero(&func); }           \
-  TEST_F(LlvmLibcFMinimumNumTest, Range) { testRange(&func); }
+#define LIST_FMINIMUM_NUM_TESTS(Name, T, func)                                 \
+  using LlvmLibc##Name##Test = FMinimumNumTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMNUMTEST_H
diff --git a/libc/test/src/math/smoke/FMinimumTest.h b/libc/test/src/math/smoke/FMinimumTest.h
index f8976ad838496..6e648c9844ed9 100644
--- a/libc/test/src/math/smoke/FMinimumTest.h
+++ b/libc/test/src/math/smoke/FMinimumTest.h
@@ -79,12 +79,12 @@ class FMinimumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMINIMUM_TESTS(T, func)                                           \
-  using LlvmLibcFMinimumTest = FMinimumTest<T>;                                \
-  TEST_F(LlvmLibcFMinimumTest, NaN) { testNaN(&func); }                        \
-  TEST_F(LlvmLibcFMinimumTest, InfArg) { testInfArg(&func); }                  \
-  TEST_F(LlvmLibcFMinimumTest, NegInfArg) { testNegInfArg(&func); }            \
-  TEST_F(LlvmLibcFMinimumTest, BothZero) { testBothZero(&func); }              \
-  TEST_F(LlvmLibcFMinimumTest, Range) { testRange(&func); }
+#define LIST_FMINIMUM_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = FMinimumTest<T>;                                \
+  TEST_F(LlvmLibc##Name##Test, NaN) { testNaN(&func); }                        \
+  TEST_F(LlvmLibc##Name##Test, InfArg) { testInfArg(&func); }                  \
+  TEST_F(LlvmLibc##Name##Test, NegInfArg) { testNegInfArg(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, BothZero) { testBothZero(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMTEST_H
diff --git a/libc/test/src/math/smoke/FModTest.h b/libc/test/src/math/smoke/FModTest.h
index ad351432dfcf5..1b70eed19d8ea 100644
--- a/libc/test/src/math/smoke/FModTest.h
+++ b/libc/test/src/math/smoke/FModTest.h
@@ -269,9 +269,9 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMOD_TESTS(T, func)                                               \
-  using LlvmLibcFmodTest = FmodTest<T>;                                        \
-  TEST_F(LlvmLibcFmodTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcFmodTest, RegularExtreme) { testRegularExtreme(&func); }
+#define LIST_FMOD_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = FmodTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RegularExtreme) { testRegularExtreme(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMODTEST_H
diff --git a/libc/test/src/math/smoke/FloorTest.h b/libc/test/src/math/smoke/FloorTest.h
index cbcf276cddfff..d3df7dda60f11 100644
--- a/libc/test/src/math/smoke/FloorTest.h
+++ b/libc/test/src/math/smoke/FloorTest.h
@@ -67,10 +67,10 @@ class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FLOOR_TESTS(T, func)                                              \
-  using LlvmLibcFloorTest = FloorTest<T>;                                      \
-  TEST_F(LlvmLibcFloorTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcFloorTest, RoundedNubmers) { testRoundedNumbers(&func); }     \
-  TEST_F(LlvmLibcFloorTest, Fractions) { testFractions(&func); }
+#define LIST_FLOOR_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = FloorTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_FLOORTEST_H
diff --git a/libc/test/src/math/smoke/FmaTest.h b/libc/test/src/math/smoke/FmaTest.h
index 0d775acad95fd..dfd8b7ffb3fce 100644
--- a/libc/test/src/math/smoke/FmaTest.h
+++ b/libc/test/src/math/smoke/FmaTest.h
@@ -111,12 +111,12 @@ class FmaTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FMA_TESTS(T, func)                                                \
-  using LlvmLibcFmaTest = FmaTestTemplate<T>;                                  \
-  TEST_F(LlvmLibcFmaTest, SpecialNumbers) { test_special_numbers(&func); }
+#define LIST_FMA_TESTS(Name, T, func)                                          \
+  using LlvmLibc##Name##Test = FmaTestTemplate<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { test_special_numbers(&func); }
 
-#define LIST_NARROWING_FMA_TESTS(OutType, InType, func)                        \
-  using LlvmLibcFmaTest = FmaTestTemplate<OutType, InType>;                    \
-  TEST_F(LlvmLibcFmaTest, SpecialNumbers) { test_special_numbers(&func); }
+#define LIST_NARROWING_FMA_TESTS(Name, OutType, InType, func)                  \
+  using LlvmLibc##Name##Test = FmaTestTemplate<OutType, InType>;               \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { test_special_numbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_FMATEST_H
diff --git a/libc/test/src/math/smoke/FrexpTest.h b/libc/test/src/math/smoke/FrexpTest.h
index 3fb3a2e1688c8..15c17828374c5 100644
--- a/libc/test/src/math/smoke/FrexpTest.h
+++ b/libc/test/src/math/smoke/FrexpTest.h
@@ -96,9 +96,9 @@ class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FREXP_TESTS(T, func)                                              \
-  using LlvmLibcFrexpTest = FrexpTest<T>;                                      \
-  TEST_F(LlvmLibcFrexpTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcFrexpTest, PowersOfTwo) { testPowersOfTwo(&func); }           \
-  TEST_F(LlvmLibcFrexpTest, SomeIntegers) { testSomeIntegers(&func); }         \
+#define LIST_FREXP_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = FrexpTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SomeIntegers) { testSomeIntegers(&func); }      \
   static_assert(true, "Require semicolon.")
diff --git a/libc/test/src/math/smoke/FromfpTest.h b/libc/test/src/math/smoke/FromfpTest.h
index 708ec25fff438..fe78c9050a7fe 100644
--- a/libc/test/src/math/smoke/FromfpTest.h
+++ b/libc/test/src/math/smoke/FromfpTest.h
@@ -471,54 +471,54 @@ class FromfpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FROMFP_TESTS(T, func)                                             \
-  using LlvmLibcFromfpTest = FromfpTestTemplate<T>;                            \
-  TEST_F(LlvmLibcFromfpTest, SpecialNumbersNonzeroWidth) {                     \
+#define LIST_FROMFP_TESTS(Name, T, func)                                       \
+  using LlvmLibc##Name##Test = FromfpTestTemplate<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersNonzeroWidth) {                   \
     testSpecialNumbersNonzeroWidth(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, SpecialNumbersZeroWidth) {                        \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersZeroWidth) {                      \
     testSpecialNumbersZeroWidth(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, RoundedNumbersWithinRange) {                      \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersWithinRange) {                    \
     testRoundedNumbersWithinRange(&func);                                      \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, RoundedNumbersOutsideRange) {                     \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersOutsideRange) {                   \
     testRoundedNumbersOutsideRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsUpwardWithinRange) {                     \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardWithinRange) {                   \
     testFractionsUpwardWithinRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsUpwardOutsideRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardOutsideRange) {                  \
     testFractionsUpwardOutsideRange(&func);                                    \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsDownwardWithinRange) {                   \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardWithinRange) {                 \
     testFractionsDownwardWithinRange(&func);                                   \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsDownwardOutsideRange) {                  \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardOutsideRange) {                \
     testFractionsDownwardOutsideRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsTowardZeroWithinRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroWithinRange) {               \
     testFractionsTowardZeroWithinRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsTowardZeroOutsideRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroOutsideRange) {              \
     testFractionsTowardZeroOutsideRange(&func);                                \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestFromZeroWithinRange) {          \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroWithinRange) {        \
     testFractionsToNearestFromZeroWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestFromZeroOutsideRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroOutsideRange) {       \
     testFractionsToNearestFromZeroOutsideRange(&func);                         \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestWithinRange) {                  \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestWithinRange) {                \
     testFractionsToNearestWithinRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestOutsideRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestOutsideRange) {               \
     testFractionsToNearestOutsideRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestFallbackWithinRange) {          \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackWithinRange) {        \
     testFractionsToNearestFallbackWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpTest, FractionsToNearestFallbackOutsideRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackOutsideRange) {       \
     testFractionsToNearestFallbackOutsideRange(&func);                         \
   }
 
diff --git a/libc/test/src/math/smoke/FromfpxTest.h b/libc/test/src/math/smoke/FromfpxTest.h
index 1930b22c80b11..5696ad16520a7 100644
--- a/libc/test/src/math/smoke/FromfpxTest.h
+++ b/libc/test/src/math/smoke/FromfpxTest.h
@@ -633,54 +633,54 @@ class FromfpxTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_FROMFPX_TESTS(T, func)                                            \
-  using LlvmLibcFromfpxTest = FromfpxTestTemplate<T>;                          \
-  TEST_F(LlvmLibcFromfpxTest, SpecialNumbersNonzeroWidth) {                    \
+#define LIST_FROMFPX_TESTS(Name, T, func)                                      \
+  using LlvmLibc##Name##Test = FromfpxTestTemplate<T>;                         \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersNonzeroWidth) {                   \
     testSpecialNumbersNonzeroWidth(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, SpecialNumbersZeroWidth) {                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersZeroWidth) {                      \
     testSpecialNumbersZeroWidth(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, RoundedNumbersWithinRange) {                     \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersWithinRange) {                    \
     testRoundedNumbersWithinRange(&func);                                      \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, RoundedNumbersOutsideRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersOutsideRange) {                   \
     testRoundedNumbersOutsideRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsUpwardWithinRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardWithinRange) {                   \
     testFractionsUpwardWithinRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsUpwardOutsideRange) {                   \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardOutsideRange) {                  \
     testFractionsUpwardOutsideRange(&func);                                    \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsDownwardWithinRange) {                  \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardWithinRange) {                 \
     testFractionsDownwardWithinRange(&func);                                   \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsDownwardOutsideRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardOutsideRange) {                \
     testFractionsDownwardOutsideRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsTowardZeroWithinRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroWithinRange) {               \
     testFractionsTowardZeroWithinRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsTowardZeroOutsideRange) {               \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroOutsideRange) {              \
     testFractionsTowardZeroOutsideRange(&func);                                \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestFromZeroWithinRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroWithinRange) {        \
     testFractionsToNearestFromZeroWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestFromZeroOutsideRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroOutsideRange) {       \
     testFractionsToNearestFromZeroOutsideRange(&func);                         \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestWithinRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestWithinRange) {                \
     testFractionsToNearestWithinRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestOutsideRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestOutsideRange) {               \
     testFractionsToNearestOutsideRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestFallbackWithinRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackWithinRange) {        \
     testFractionsToNearestFallbackWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcFromfpxTest, FractionsToNearestFallbackOutsideRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackOutsideRange) {       \
     testFractionsToNearestFallbackOutsideRange(&func);                         \
   }
 
diff --git a/libc/test/src/math/smoke/GetPayloadTest.h b/libc/test/src/math/smoke/GetPayloadTest.h
index 486ea42bf50c1..66de3a6b7a676 100644
--- a/libc/test/src/math/smoke/GetPayloadTest.h
+++ b/libc/test/src/math/smoke/GetPayloadTest.h
@@ -98,9 +98,9 @@ class GetPayloadTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_GETPAYLOAD_TESTS(T, func)                                         \
-  using LlvmLibcGetPayloadTest = GetPayloadTestTemplate<T>;                    \
-  TEST_F(LlvmLibcGetPayloadTest, NonNaNs) { testNonNaNs(&func); }              \
-  TEST_F(LlvmLibcGetPayloadTest, NaNs) { testNaNs(&func); }
+#define LIST_GETPAYLOAD_TESTS(Name, T, func)                                   \
+  using LlvmLibc##Name##Test = GetPayloadTestTemplate<T>;                      \
+  TEST_F(LlvmLibc##Name##Test, NonNaNs) { testNonNaNs(&func); }                \
+  TEST_F(LlvmLibc##Name##Test, NaNs) { testNaNs(&func); }
 
 #endif // LIBC_TEST_SRC_MATH_SMOKE_GETPAYLOADTEST_H
diff --git a/libc/test/src/math/smoke/ILogbTest.h b/libc/test/src/math/smoke/ILogbTest.h
index 7d53b3376d393..7b9c1cc7f32bb 100644
--- a/libc/test/src/math/smoke/ILogbTest.h
+++ b/libc/test/src/math/smoke/ILogbTest.h
@@ -116,13 +116,17 @@ class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_INTLOGB_TESTS(OutType, InType, Func)                              \
-  using LlvmLibcIntLogbTest = LlvmLibcILogbTest<OutType, InType>;              \
-  TEST_F(LlvmLibcIntLogbTest, SpecialNumbers) { test_special_numbers(&Func); } \
-  TEST_F(LlvmLibcIntLogbTest, PowersOfTwo) { test_powers_of_two(&Func); }      \
-  TEST_F(LlvmLibcIntLogbTest, SomeIntegers) { test_some_integers(&Func); }     \
-  TEST_F(LlvmLibcIntLogbTest, SubnormalRange) { test_subnormal_range(&Func); } \
-  TEST_F(LlvmLibcIntLogbTest, NormalRange) { test_normal_range(&Func); }       \
+#define LIST_INTLOGB_TESTS(Name, OutType, InType, Func)                        \
+  using LlvmLibc##Name##Test = LlvmLibcILogbTest<OutType, InType>;             \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&Func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { test_powers_of_two(&Func); }     \
+  TEST_F(LlvmLibc##Name##Test, SomeIntegers) { test_some_integers(&Func); }    \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) {                               \
+    test_subnormal_range(&Func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, NormalRange) { test_normal_range(&Func); }      \
   static_assert(true)
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_ILOGBTEST_H
diff --git a/libc/test/src/math/smoke/IsCanonicalTest.h b/libc/test/src/math/smoke/IsCanonicalTest.h
index 8b6554b97f035..011c3d3cb524e 100644
--- a/libc/test/src/math/smoke/IsCanonicalTest.h
+++ b/libc/test/src/math/smoke/IsCanonicalTest.h
@@ -48,11 +48,9 @@ class IsCanonicalTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ISCANONICAL_TESTS(T, func)                                        \
-  using LlvmLibcIsCanonicalTest = IsCanonicalTest<T>;                          \
-  TEST_F(LlvmLibcIsCanonicalTest, SpecialNumbers) {                            \
-    testSpecialNumbers(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcIsCanonicalTest, RoundedNubmers) { testRoundedNumbers(&func); }
+#define LIST_ISCANONICAL_TESTS(Name, T, func)                                  \
+  using LlvmLibc##Name##Test = IsCanonicalTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ISCANONICALTEST_H
diff --git a/libc/test/src/math/smoke/IsNanTest.h b/libc/test/src/math/smoke/IsNanTest.h
index 4f33af86f4c4f..35c7f06f8e6c0 100644
--- a/libc/test/src/math/smoke/IsNanTest.h
+++ b/libc/test/src/math/smoke/IsNanTest.h
@@ -48,9 +48,9 @@ class IsNanTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ISNAN_TESTS(T, func)                                              \
-  using LlvmLibcIsNanTest = IsNanTest<T>;                                      \
-  TEST_F(LlvmLibcIsNanTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcIsNanTest, RoundedNumbers) { testRoundedNumbers(&func); }
+#define LIST_ISNAN_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = IsNanTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ISNANTEST_H
diff --git a/libc/test/src/math/smoke/IsSignalingTest.h b/libc/test/src/math/smoke/IsSignalingTest.h
index f52642ad27bea..561c355433741 100644
--- a/libc/test/src/math/smoke/IsSignalingTest.h
+++ b/libc/test/src/math/smoke/IsSignalingTest.h
@@ -50,11 +50,9 @@ class IsSignalingTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ISSIGNALING_TESTS(T, func)                                        \
-  using LlvmLibcIsSignalingTest = IsSignalingTest<T>;                          \
-  TEST_F(LlvmLibcIsSignalingTest, SpecialNumbers) {                            \
-    testSpecialNumbers(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcIsSignalingTest, RoundedNubmers) { testRoundedNumbers(&func); }
+#define LIST_ISSIGNALING_TESTS(Name, T, func)                                  \
+  using LlvmLibc##Name##Test = IsSignalingTest<T>;                             \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ISSIGNALINGTEST_H
diff --git a/libc/test/src/math/smoke/LdExpTest.h b/libc/test/src/math/smoke/LdExpTest.h
index d005f053c0c91..463a0e1aeee6c 100644
--- a/libc/test/src/math/smoke/LdExpTest.h
+++ b/libc/test/src/math/smoke/LdExpTest.h
@@ -167,18 +167,20 @@ class LdExpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_LDEXP_TESTS(T, func)                                              \
-  using LlvmLibcLdExpTest = LdExpTestTemplate<T>;                              \
-  TEST_F(LlvmLibcLdExpTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcLdExpTest, PowersOfTwo) { testPowersOfTwo(&func); }           \
-  TEST_F(LlvmLibcLdExpTest, OverFlow) { testOverflow(&func); }                 \
-  TEST_F(LlvmLibcLdExpTest, UnderflowToZeroOnNormal) {                         \
+#define LIST_LDEXP_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = LdExpTestTemplate<T>;                           \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, OverFlow) { testOverflow(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnNormal) {                      \
     testUnderflowToZeroOnNormal(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcLdExpTest, UnderflowToZeroOnSubnormal) {                      \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnSubnormal) {                   \
     testUnderflowToZeroOnSubnormal(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcLdExpTest, NormalOperation) { testNormalOperation(&func); }   \
+  TEST_F(LlvmLibc##Name##Test, NormalOperation) {                              \
+    testNormalOperation(&func);                                                \
+  }                                                                            \
   static_assert(true)
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_LDEXPTEST_H
diff --git a/libc/test/src/math/smoke/LogbTest.h b/libc/test/src/math/smoke/LogbTest.h
index d876eb6fe17a6..3162af735c374 100644
--- a/libc/test/src/math/smoke/LogbTest.h
+++ b/libc/test/src/math/smoke/LogbTest.h
@@ -88,9 +88,9 @@ class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_LOGB_TESTS(T, func)                                               \
-  using LlvmLibcLogbTest = LogbTest<T>;                                        \
-  TEST_F(LlvmLibcLogbTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcLogbTest, PowersOfTwo) { testPowersOfTwo(&func); }            \
-  TEST_F(LlvmLibcLogbTest, SomeIntegers) { testSomeIntegers(&func); }          \
-  TEST_F(LlvmLibcLogbTest, InRange) { testRange(&func); }
+#define LIST_LOGB_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = LogbTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SomeIntegers) { testSomeIntegers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InRange) { testRange(&func); }
diff --git a/libc/test/src/math/smoke/ModfTest.h b/libc/test/src/math/smoke/ModfTest.h
index a21555d5f3765..5da21d507f6f1 100644
--- a/libc/test/src/math/smoke/ModfTest.h
+++ b/libc/test/src/math/smoke/ModfTest.h
@@ -110,9 +110,9 @@ class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_MODF_TESTS(T, func)                                               \
-  using LlvmLibcModfTest = ModfTest<T>;                                        \
-  TEST_F(LlvmLibcModfTest, SpecialNumbers) { testSpecialNumbers(&func); }      \
-  TEST_F(LlvmLibcModfTest, RoundedNubmers) { testIntegers(&func); }            \
-  TEST_F(LlvmLibcModfTest, Fractions) { testFractions(&func); }                \
-  TEST_F(LlvmLibcModfTest, Range) { testRange(&func); }
+#define LIST_MODF_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = ModfTest<T>;                                    \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testIntegers(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, Range) { testRange(&func); }
diff --git a/libc/test/src/math/smoke/MulTest.h b/libc/test/src/math/smoke/MulTest.h
index 08f0bcf9f62ce..c9327b3c6e285 100644
--- a/libc/test/src/math/smoke/MulTest.h
+++ b/libc/test/src/math/smoke/MulTest.h
@@ -142,13 +142,15 @@ class MulTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_MUL_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcMulTest = MulTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcMulTest, SpecialNumbers) { test_special_numbers(&func); }     \
-  TEST_F(LlvmLibcMulTest, InvalidOperations) {                                 \
+#define LIST_MUL_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = MulTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, InvalidOperations) {                            \
     test_invalid_operations(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcMulTest, RangeErrors) { test_range_errors(&func); }           \
-  TEST_F(LlvmLibcMulTest, InexactResults) { test_inexact_results(&func); }
+  TEST_F(LlvmLibc##Name##Test, RangeErrors) { test_range_errors(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InexactResults) { test_inexact_results(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_MULTEST_H
diff --git a/libc/test/src/math/smoke/NearbyIntTest.h b/libc/test/src/math/smoke/NearbyIntTest.h
index 5d217fc2977ee..af7a7df3a068d 100644
--- a/libc/test/src/math/smoke/NearbyIntTest.h
+++ b/libc/test/src/math/smoke/NearbyIntTest.h
@@ -77,22 +77,22 @@ class NearbyIntTestTemplate : public LIBC_NAMESPACE::testing::Test {
   }
 };
 
-#define LIST_NEARBYINT_TESTS(T, func)                                          \
-  using LlvmLibcNearbyIntTest = NearbyIntTestTemplate<T>;                      \
-  TEST_F(LlvmLibcNearbyIntTest, TestNaN) { testNaN(&func); }                   \
-  TEST_F(LlvmLibcNearbyIntTest, TestInfinities) { testInfinities(&func); }     \
-  TEST_F(LlvmLibcNearbyIntTest, TestZeroes) { testZeroes(&func); }             \
-  TEST_F(LlvmLibcNearbyIntTest, TestIntegers) { testIntegers(&func); }         \
-  TEST_F(LlvmLibcNearbyIntTest, TestSubnormalToNearest) {                      \
+#define LIST_NEARBYINT_TESTS(Name, T, func)                                    \
+  using LlvmLibc##Name##Test = NearbyIntTestTemplate<T>;                       \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestInfinities) { testInfinities(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, TestZeroes) { testZeroes(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, TestIntegers) { testIntegers(&func); }          \
+  TEST_F(LlvmLibc##Name##Test, TestSubnormalToNearest) {                       \
     testSubnormalToNearest(&func);                                             \
   }                                                                            \
-  TEST_F(LlvmLibcNearbyIntTest, TestSubnormalTowardZero) {                     \
+  TEST_F(LlvmLibc##Name##Test, TestSubnormalTowardZero) {                      \
     testSubnormalTowardZero(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcNearbyIntTest, TestSubnormalToPosInf) {                       \
+  TEST_F(LlvmLibc##Name##Test, TestSubnormalToPosInf) {                        \
     testSubnormalToPosInf(&func);                                              \
   }                                                                            \
-  TEST_F(LlvmLibcNearbyIntTest, TestSubnormalToNegInf) {                       \
+  TEST_F(LlvmLibc##Name##Test, TestSubnormalToNegInf) {                        \
     testSubnormalToNegInf(&func);                                              \
   }
 
diff --git a/libc/test/src/math/smoke/NextAfterTest.h b/libc/test/src/math/smoke/NextAfterTest.h
index af253d778a029..6c7ec870d7ec0 100644
--- a/libc/test/src/math/smoke/NextAfterTest.h
+++ b/libc/test/src/math/smoke/NextAfterTest.h
@@ -216,9 +216,9 @@ class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEXTAFTER_TESTS(T, func)                                          \
-  using LlvmLibcNextAfterTest = NextAfterTestTemplate<T>;                      \
-  TEST_F(LlvmLibcNextAfterTest, TestNaN) { testNaN(&func); }                   \
-  TEST_F(LlvmLibcNextAfterTest, TestBoundaries) { testBoundaries(&func); }
+#define LIST_NEXTAFTER_TESTS(Name, T, func)                                    \
+  using LlvmLibc##Name##Test = NextAfterTestTemplate<T>;                       \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestBoundaries) { testBoundaries(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
diff --git a/libc/test/src/math/smoke/NextDownTest.h b/libc/test/src/math/smoke/NextDownTest.h
index b54c6d5763222..0b0ab83bcb6b6 100644
--- a/libc/test/src/math/smoke/NextDownTest.h
+++ b/libc/test/src/math/smoke/NextDownTest.h
@@ -36,9 +36,9 @@ class NextDownTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEXTDOWN_TESTS(T, func)                                           \
-  using LlvmLibcNextDownTest = NextDownTestTemplate<T>;                        \
-  TEST_F(LlvmLibcNextDownTest, TestNaN) { testNaN(&func); }                    \
-  TEST_F(LlvmLibcNextDownTest, TestBoundaries) { testBoundaries(&func); }
+#define LIST_NEXTDOWN_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = NextDownTestTemplate<T>;                        \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestBoundaries) { testBoundaries(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEXTDOWNTEST_H
diff --git a/libc/test/src/math/smoke/NextTowardTest.h b/libc/test/src/math/smoke/NextTowardTest.h
index 6fee0d3da86de..e6fca6861542e 100644
--- a/libc/test/src/math/smoke/NextTowardTest.h
+++ b/libc/test/src/math/smoke/NextTowardTest.h
@@ -227,9 +227,9 @@ class NextTowardTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEXTTOWARD_TESTS(T, func)                                         \
-  using LlvmLibcNextTowardTest = NextTowardTestTemplate<T>;                    \
-  TEST_F(LlvmLibcNextTowardTest, TestNaN) { testNaN(&func); }                  \
-  TEST_F(LlvmLibcNextTowardTest, TestBoundaries) { testBoundaries(&func); }
+#define LIST_NEXTTOWARD_TESTS(Name, T, func)                                   \
+  using LlvmLibc##Name##Test = NextTowardTestTemplate<T>;                      \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestBoundaries) { testBoundaries(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEXTTOWARDTEST_H
diff --git a/libc/test/src/math/smoke/NextUpTest.h b/libc/test/src/math/smoke/NextUpTest.h
index 7f66c115dfc2d..886be60e59572 100644
--- a/libc/test/src/math/smoke/NextUpTest.h
+++ b/libc/test/src/math/smoke/NextUpTest.h
@@ -36,9 +36,9 @@ class NextUpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_NEXTUP_TESTS(T, func)                                             \
-  using LlvmLibcNextUpTest = NextUpTestTemplate<T>;                            \
-  TEST_F(LlvmLibcNextUpTest, TestNaN) { testNaN(&func); }                      \
-  TEST_F(LlvmLibcNextUpTest, TestBoundaries) { testBoundaries(&func); }
+#define LIST_NEXTUP_TESTS(Name, T, func)                                       \
+  using LlvmLibc##Name##Test = NextUpTestTemplate<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, TestNaN) { testNaN(&func); }                    \
+  TEST_F(LlvmLibc##Name##Test, TestBoundaries) { testBoundaries(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_NEXTUPTEST_H
diff --git a/libc/test/src/math/smoke/RIntTest.h b/libc/test/src/math/smoke/RIntTest.h
index 1b460050e4ae0..7eafd12ecda2b 100644
--- a/libc/test/src/math/smoke/RIntTest.h
+++ b/libc/test/src/math/smoke/RIntTest.h
@@ -44,8 +44,8 @@ class RIntTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_RINT_TESTS(F, func)                                               \
-  using LlvmLibcRIntTest = RIntTestTemplate<F>;                                \
-  TEST_F(LlvmLibcRIntTest, specialNumbers) { testSpecialNumbers(&func); }
+#define LIST_RINT_TESTS(Name, F, func)                                         \
+  using LlvmLibc##Name##Test = RIntTestTemplate<F>;                            \
+  TEST_F(LlvmLibc##Name##Test, specialNumbers) { testSpecialNumbers(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_RINTTEST_H
diff --git a/libc/test/src/math/smoke/RemQuoTest.h b/libc/test/src/math/smoke/RemQuoTest.h
index 2fdb594d4f8af..ec0e7636f5259 100644
--- a/libc/test/src/math/smoke/RemQuoTest.h
+++ b/libc/test/src/math/smoke/RemQuoTest.h
@@ -93,10 +93,10 @@ class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_REMQUO_TESTS(T, func)                                             \
-  using LlvmLibcRemQuoTest = RemQuoTestTemplate<T>;                            \
-  TEST_F(LlvmLibcRemQuoTest, SpecialNumbers) { testSpecialNumbers(&func); }    \
-  TEST_F(LlvmLibcRemQuoTest, EqualNumeratorAndDenominator) {                   \
+#define LIST_REMQUO_TESTS(Name, T, func)                                       \
+  using LlvmLibc##Name##Test = RemQuoTestTemplate<T>;                          \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, EqualNumeratorAndDenominator) {                 \
     testEqualNumeratorAndDenominator(&func);                                   \
   }
 
diff --git a/libc/test/src/math/smoke/RoundEvenTest.h b/libc/test/src/math/smoke/RoundEvenTest.h
index 3477315e683a4..7030ed796674d 100644
--- a/libc/test/src/math/smoke/RoundEvenTest.h
+++ b/libc/test/src/math/smoke/RoundEvenTest.h
@@ -64,10 +64,10 @@ class RoundEvenTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ROUNDEVEN_TESTS(T, func)                                          \
-  using LlvmLibcRoundEvenTest = RoundEvenTest<T>;                              \
-  TEST_F(LlvmLibcRoundEvenTest, SpecialNumbers) { testSpecialNumbers(&func); } \
-  TEST_F(LlvmLibcRoundEvenTest, RoundedNubmers) { testRoundedNumbers(&func); } \
-  TEST_F(LlvmLibcRoundEvenTest, Fractions) { testFractions(&func); }
+#define LIST_ROUNDEVEN_TESTS(Name, T, func)                                    \
+  using LlvmLibc##Name##Test = RoundEvenTest<T>;                               \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDEVENTEST_H
diff --git a/libc/test/src/math/smoke/RoundTest.h b/libc/test/src/math/smoke/RoundTest.h
index 5459986db0451..a75c88f870e08 100644
--- a/libc/test/src/math/smoke/RoundTest.h
+++ b/libc/test/src/math/smoke/RoundTest.h
@@ -68,10 +68,10 @@ class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_ROUND_TESTS(T, func)                                              \
-  using LlvmLibcRoundTest = RoundTest<T>;                                      \
-  TEST_F(LlvmLibcRoundTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcRoundTest, RoundedNubmers) { testRoundedNumbers(&func); }     \
-  TEST_F(LlvmLibcRoundTest, Fractions) { testFractions(&func); }
+#define LIST_ROUND_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = RoundTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDTEST_H
diff --git a/libc/test/src/math/smoke/RoundToIntegerTest.h b/libc/test/src/math/smoke/RoundToIntegerTest.h
index 14d57f80a593f..63e868afb3af2 100644
--- a/libc/test/src/math/smoke/RoundToIntegerTest.h
+++ b/libc/test/src/math/smoke/RoundToIntegerTest.h
@@ -127,30 +127,24 @@ class RoundToIntegerTestTemplate
   }
 };
 
-#define LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func,           \
+#define LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func,     \
                                            TestModes)                          \
-  using LlvmLibcRoundToIntegerTest =                                           \
+  using LlvmLibc##Name##Test =                                                 \
       RoundToIntegerTestTemplate<FloatType, IntType, TestModes>;               \
-  TEST_F(LlvmLibcRoundToIntegerTest, InfinityAndNaN) {                         \
-    testInfinityAndNaN(&func);                                                 \
-  }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, RoundNumbers) {                           \
-    testRoundNumbers(&func);                                                   \
-  }                                                                            \
-  TEST_F(LlvmLibcRoundToIntegerTest, SubnormalRange) {                         \
-    testSubnormalRange(&func);                                                 \
-  }
+  TEST_F(LlvmLibc##Name##Test, InfinityAndNaN) { testInfinityAndNaN(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundNumbers) { testRoundNumbers(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, SubnormalRange) { testSubnormalRange(&func); }
 
-#define LIST_ROUND_TO_INTEGER_TESTS(FloatType, IntType, func)                  \
-  LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func, false)
+#define LIST_ROUND_TO_INTEGER_TESTS(Name, FloatType, IntType, func)            \
+  LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func, false)
 
 // The GPU target does not support different rounding modes.
 #ifdef LIBC_TARGET_ARCH_IS_GPU
-#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(FloatType, IntType, func)       \
-  LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func, false)
+#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Name, FloatType, IntType, func) \
+  LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func, false)
 #else
-#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(FloatType, IntType, func)       \
-  LIST_ROUND_TO_INTEGER_TESTS_HELPER(FloatType, IntType, func, true)
+#define LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Name, FloatType, IntType, func) \
+  LIST_ROUND_TO_INTEGER_TESTS_HELPER(Name, FloatType, IntType, func, true)
 #endif
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDTOINTEGERTEST_H
diff --git a/libc/test/src/math/smoke/ScalbnTest.h b/libc/test/src/math/smoke/ScalbnTest.h
index 67ea30f9f0df6..c86ba8b46810a 100644
--- a/libc/test/src/math/smoke/ScalbnTest.h
+++ b/libc/test/src/math/smoke/ScalbnTest.h
@@ -12,17 +12,17 @@
 #include "LdExpTest.h"
 #include "test/UnitTest/Test.h"
 
-#define LIST_SCALBN_TESTS(T, U, func)                                          \
-  using LlvmLibcScalbnTest = LdExpTestTemplate<T, U>;                          \
-  TEST_F(LlvmLibcScalbnTest, SpecialNumbers) { testSpecialNumbers(&func); }    \
-  TEST_F(LlvmLibcScalbnTest, PowersOfTwo) { testPowersOfTwo(&func); }          \
-  TEST_F(LlvmLibcScalbnTest, OverFlow) { testOverflow(&func); }                \
-  TEST_F(LlvmLibcScalbnTest, UnderflowToZeroOnNormal) {                        \
+#define LIST_SCALBN_TESTS(Name, T, U, func)                                    \
+  using LlvmLibc##Name##Test = LdExpTestTemplate<T, U>;                        \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, PowersOfTwo) { testPowersOfTwo(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, OverFlow) { testOverflow(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnNormal) {                      \
     testUnderflowToZeroOnNormal(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcScalbnTest, UnderflowToZeroOnSubnormal) {                     \
+  TEST_F(LlvmLibc##Name##Test, UnderflowToZeroOnSubnormal) {                   \
     testUnderflowToZeroOnSubnormal(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcScalbnTest, NormalOperation) { testNormalOperation(&func); }
+  TEST_F(LlvmLibc##Name##Test, NormalOperation) { testNormalOperation(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SCALBN_H
diff --git a/libc/test/src/math/smoke/SetPayloadSigTest.h b/libc/test/src/math/smoke/SetPayloadSigTest.h
index 7b26c98b7ee35..9ddcc4a43a7b9 100644
--- a/libc/test/src/math/smoke/SetPayloadSigTest.h
+++ b/libc/test/src/math/smoke/SetPayloadSigTest.h
@@ -93,11 +93,11 @@ class SetPayloadSigTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SETPAYLOADSIG_TESTS(T, func)                                      \
-  using LlvmLibcSetPayloadSigTest = SetPayloadSigTestTemplate<T>;              \
-  TEST_F(LlvmLibcSetPayloadSigTest, InvalidPayloads) {                         \
+#define LIST_SETPAYLOADSIG_TESTS(Name, T, func)                                \
+  using LlvmLibc##Name##Test = SetPayloadSigTestTemplate<T>;                   \
+  TEST_F(LlvmLibc##Name##Test, InvalidPayloads) {                              \
     testInvalidPayloads(&func);                                                \
   }                                                                            \
-  TEST_F(LlvmLibcSetPayloadSigTest, ValidPayloads) { testValidPayloads(&func); }
+  TEST_F(LlvmLibc##Name##Test, ValidPayloads) { testValidPayloads(&func); }
 
 #endif // LIBC_TEST_SRC_MATH_SMOKE_SETPAYLOADSIGTEST_H
diff --git a/libc/test/src/math/smoke/SetPayloadTest.h b/libc/test/src/math/smoke/SetPayloadTest.h
index b86b3250f03a8..15098636d896c 100644
--- a/libc/test/src/math/smoke/SetPayloadTest.h
+++ b/libc/test/src/math/smoke/SetPayloadTest.h
@@ -98,11 +98,11 @@ class SetPayloadTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SETPAYLOAD_TESTS(T, func)                                         \
-  using LlvmLibcSetPayloadTest = SetPayloadTestTemplate<T>;                    \
-  TEST_F(LlvmLibcSetPayloadTest, InvalidPayloads) {                            \
+#define LIST_SETPAYLOAD_TESTS(Name, T, func)                                   \
+  using LlvmLibc##Name##Test = SetPayloadTestTemplate<T>;                      \
+  TEST_F(LlvmLibc##Name##Test, InvalidPayloads) {                              \
     testInvalidPayloads(&func);                                                \
   }                                                                            \
-  TEST_F(LlvmLibcSetPayloadTest, ValidPayloads) { testValidPayloads(&func); }
+  TEST_F(LlvmLibc##Name##Test, ValidPayloads) { testValidPayloads(&func); }
 
 #endif // LIBC_TEST_SRC_MATH_SMOKE_SETPAYLOADTEST_H
diff --git a/libc/test/src/math/smoke/SqrtTest.h b/libc/test/src/math/smoke/SqrtTest.h
index 29666ad0d4e56..c3e60f6fd64af 100644
--- a/libc/test/src/math/smoke/SqrtTest.h
+++ b/libc/test/src/math/smoke/SqrtTest.h
@@ -37,11 +37,13 @@ class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SQRT_TESTS(T, func)                                               \
-  using LlvmLibcSqrtTest = SqrtTest<T, T>;                                     \
-  TEST_F(LlvmLibcSqrtTest, SpecialNumbers) { test_special_numbers(&func); }    \
+#define LIST_SQRT_TESTS(Name, T, func)                                         \
+  using LlvmLibc##Name##Test = SqrtTest<T, T>;                                 \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&func);                                               \
+  }                                                                            \
   static_assert(true, "Require semicolon.")
 
-#define LIST_NARROWING_SQRT_TESTS(OutType, InType, func)                       \
-  using LlvmLibcSqrtTest = SqrtTest<OutType, InType>;                          \
-  TEST_F(LlvmLibcSqrtTest, SpecialNumbers) { test_special_numbers(&func); }
+#define LIST_NARROWING_SQRT_TESTS(Name, OutType, InType, func)                 \
+  using LlvmLibc##Name##Test = SqrtTest<OutType, InType>;                      \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { test_special_numbers(&func); }
diff --git a/libc/test/src/math/smoke/SubTest.h b/libc/test/src/math/smoke/SubTest.h
index 4efceecc11ebf..b1ead64e71f1c 100644
--- a/libc/test/src/math/smoke/SubTest.h
+++ b/libc/test/src/math/smoke/SubTest.h
@@ -157,16 +157,22 @@ class SubTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_SUB_TESTS(OutType, InType, func)                                  \
-  using LlvmLibcSubTest = SubTest<OutType, InType>;                            \
-  TEST_F(LlvmLibcSubTest, SpecialNumbers) { test_special_numbers(&func); }     \
-  TEST_F(LlvmLibcSubTest, InvalidOperations) {                                 \
+#define LIST_SUB_TESTS(Name, OutType, InType, func)                            \
+  using LlvmLibc##Name##Test = SubTest<OutType, InType>;                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) {                               \
+    test_special_numbers(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, InvalidOperations) {                            \
     test_invalid_operations(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcSubTest, RangeErrors) { test_range_errors(&func); }           \
-  TEST_F(LlvmLibcSubTest, InexactResults) { test_inexact_results(&func); }     \
-  TEST_F(LlvmLibcSubTest, MixedSigns) { test_mixed_signs(&func); }             \
-  TEST_F(LlvmLibcSubTest, SignedZeroResult) { test_signed_zero_result(&func); }
+  TEST_F(LlvmLibc##Name##Test, RangeErrors) { test_range_errors(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, InexactResults) {                               \
+    test_inexact_results(&func);                                               \
+  }                                                                            \
+  TEST_F(LlvmLibc##Name##Test, MixedSigns) { test_mixed_signs(&func); }        \
+  TEST_F(LlvmLibc##Name##Test, SignedZeroResult) {                             \
+    test_signed_zero_result(&func);                                            \
+  }
 
 #define LIST_SUB_SAME_TYPE_TESTS(suffix, OutType, InType, func)                \
   using LlvmLibcSubTest##suffix = SubTest<OutType, InType>;                    \
diff --git a/libc/test/src/math/smoke/TotalOrderMagTest.h b/libc/test/src/math/smoke/TotalOrderMagTest.h
index 8a389df089328..da7641cade14a 100644
--- a/libc/test/src/math/smoke/TotalOrderMagTest.h
+++ b/libc/test/src/math/smoke/TotalOrderMagTest.h
@@ -148,18 +148,16 @@ class TotalOrderMagTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_TOTALORDERMAG_TESTS(T, func)                                      \
-  using LlvmLibcTotalOrderMagTest = TotalOrderMagTestTemplate<T>;              \
-  TEST_F(LlvmLibcTotalOrderMagTest, XLesserThanY) { testXLesserThanY(&func); } \
-  TEST_F(LlvmLibcTotalOrderMagTest, XGreaterThanY) {                           \
-    testXGreaterThanY(&func);                                                  \
-  }                                                                            \
-  TEST_F(LlvmLibcTotalOrderMagTest, XEqualToY) { testXEqualToY(&func); }       \
-  TEST_F(LlvmLibcTotalOrderMagTest, SingleNaN) { testSingleNaN(&func); }       \
-  TEST_F(LlvmLibcTotalOrderMagTest, NaNSigns) { testNaNSigns(&func); }         \
-  TEST_F(LlvmLibcTotalOrderMagTest, QuietVsSignalingNaN) {                     \
+#define LIST_TOTALORDERMAG_TESTS(Name, T, func)                                \
+  using LlvmLibc##Name##Test = TotalOrderMagTestTemplate<T>;                   \
+  TEST_F(LlvmLibc##Name##Test, XLesserThanY) { testXLesserThanY(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, XGreaterThanY) { testXGreaterThanY(&func); }    \
+  TEST_F(LlvmLibc##Name##Test, XEqualToY) { testXEqualToY(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, SingleNaN) { testSingleNaN(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, NaNSigns) { testNaNSigns(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, QuietVsSignalingNaN) {                          \
     testQuietVsSignalingNaN(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcTotalOrderMagTest, NaNPayloads) { testNaNPayloads(&func); }
+  TEST_F(LlvmLibc##Name##Test, NaNPayloads) { testNaNPayloads(&func); }
 
 #endif // LIBC_TEST_SRC_MATH_SMOKE_TOTALORDERMAGTEST_H
diff --git a/libc/test/src/math/smoke/TotalOrderTest.h b/libc/test/src/math/smoke/TotalOrderTest.h
index 50aac202f2028..c9677906aca93 100644
--- a/libc/test/src/math/smoke/TotalOrderTest.h
+++ b/libc/test/src/math/smoke/TotalOrderTest.h
@@ -146,16 +146,16 @@ class TotalOrderTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_TOTALORDER_TESTS(T, func)                                         \
-  using LlvmLibcTotalOrderTest = TotalOrderTestTemplate<T>;                    \
-  TEST_F(LlvmLibcTotalOrderTest, XLesserThanY) { testXLesserThanY(&func); }    \
-  TEST_F(LlvmLibcTotalOrderTest, XGreaterThanY) { testXGreaterThanY(&func); }  \
-  TEST_F(LlvmLibcTotalOrderTest, XEqualToY) { testXEqualToY(&func); }          \
-  TEST_F(LlvmLibcTotalOrderTest, SingleNaN) { testSingleNaN(&func); }          \
-  TEST_F(LlvmLibcTotalOrderTest, NaNSigns) { testNaNSigns(&func); }            \
-  TEST_F(LlvmLibcTotalOrderTest, QuietVsSignalingNaN) {                        \
+#define LIST_TOTALORDER_TESTS(Name, T, func)                                   \
+  using LlvmLibc##Name##Test = TotalOrderTestTemplate<T>;                      \
+  TEST_F(LlvmLibc##Name##Test, XLesserThanY) { testXLesserThanY(&func); }      \
+  TEST_F(LlvmLibc##Name##Test, XGreaterThanY) { testXGreaterThanY(&func); }    \
+  TEST_F(LlvmLibc##Name##Test, XEqualToY) { testXEqualToY(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, SingleNaN) { testSingleNaN(&func); }            \
+  TEST_F(LlvmLibc##Name##Test, NaNSigns) { testNaNSigns(&func); }              \
+  TEST_F(LlvmLibc##Name##Test, QuietVsSignalingNaN) {                          \
     testQuietVsSignalingNaN(&func);                                            \
   }                                                                            \
-  TEST_F(LlvmLibcTotalOrderTest, NaNPayloads) { testNaNPayloads(&func); }
+  TEST_F(LlvmLibc##Name##Test, NaNPayloads) { testNaNPayloads(&func); }
 
 #endif // LIBC_TEST_SRC_MATH_SMOKE_TOTALORDERTEST_H
diff --git a/libc/test/src/math/smoke/TruncTest.h b/libc/test/src/math/smoke/TruncTest.h
index e088f29db2cea..5da156e70778c 100644
--- a/libc/test/src/math/smoke/TruncTest.h
+++ b/libc/test/src/math/smoke/TruncTest.h
@@ -66,10 +66,10 @@ class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_TRUNC_TESTS(T, func)                                              \
-  using LlvmLibcTruncTest = TruncTest<T>;                                      \
-  TEST_F(LlvmLibcTruncTest, SpecialNumbers) { testSpecialNumbers(&func); }     \
-  TEST_F(LlvmLibcTruncTest, RoundedNubmers) { testRoundedNumbers(&func); }     \
-  TEST_F(LlvmLibcTruncTest, Fractions) { testFractions(&func); }
+#define LIST_TRUNC_TESTS(Name, T, func)                                        \
+  using LlvmLibc##Name##Test = TruncTest<T>;                                   \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbers) { testSpecialNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbers) { testRoundedNumbers(&func); }  \
+  TEST_F(LlvmLibc##Name##Test, Fractions) { testFractions(&func); }
 
 #endif // LLVM_LIBC_TEST_SRC_MATH_SMOKE_TRUNCTEST_H
diff --git a/libc/test/src/math/smoke/UfromfpTest.h b/libc/test/src/math/smoke/UfromfpTest.h
index 16785dedbe17e..6ec720e0fa6c4 100644
--- a/libc/test/src/math/smoke/UfromfpTest.h
+++ b/libc/test/src/math/smoke/UfromfpTest.h
@@ -405,54 +405,54 @@ class UfromfpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_UFROMFP_TESTS(T, func)                                            \
-  using LlvmLibcUfromfpTest = UfromfpTestTemplate<T>;                          \
-  TEST_F(LlvmLibcUfromfpTest, SpecialNumbersNonzeroWidth) {                    \
+#define LIST_UFROMFP_TESTS(Name, T, func)                                      \
+  using LlvmLibc##Name##Test = UfromfpTestTemplate<T>;                         \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersNonzeroWidth) {                   \
     testSpecialNumbersNonzeroWidth(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, SpecialNumbersZeroWidth) {                       \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersZeroWidth) {                      \
     testSpecialNumbersZeroWidth(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, RoundedNumbersWithinRange) {                     \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersWithinRange) {                    \
     testRoundedNumbersWithinRange(&func);                                      \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, RoundedNumbersOutsideRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersOutsideRange) {                   \
     testRoundedNumbersOutsideRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsUpwardWithinRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardWithinRange) {                   \
     testFractionsUpwardWithinRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsUpwardOutsideRange) {                   \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardOutsideRange) {                  \
     testFractionsUpwardOutsideRange(&func);                                    \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsDownwardWithinRange) {                  \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardWithinRange) {                 \
     testFractionsDownwardWithinRange(&func);                                   \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsDownwardOutsideRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardOutsideRange) {                \
     testFractionsDownwardOutsideRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsTowardZeroWithinRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroWithinRange) {               \
     testFractionsTowardZeroWithinRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsTowardZeroOutsideRange) {               \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroOutsideRange) {              \
     testFractionsTowardZeroOutsideRange(&func);                                \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestFromZeroWithinRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroWithinRange) {        \
     testFractionsToNearestFromZeroWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestFromZeroOutsideRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroOutsideRange) {       \
     testFractionsToNearestFromZeroOutsideRange(&func);                         \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestWithinRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestWithinRange) {                \
     testFractionsToNearestWithinRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestOutsideRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestOutsideRange) {               \
     testFractionsToNearestOutsideRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestFallbackWithinRange) {         \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackWithinRange) {        \
     testFractionsToNearestFallbackWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpTest, FractionsToNearestFallbackOutsideRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackOutsideRange) {       \
     testFractionsToNearestFallbackOutsideRange(&func);                         \
   }
 
diff --git a/libc/test/src/math/smoke/UfromfpxTest.h b/libc/test/src/math/smoke/UfromfpxTest.h
index 1d4d3a3a12dbc..689ff543c7a8d 100644
--- a/libc/test/src/math/smoke/UfromfpxTest.h
+++ b/libc/test/src/math/smoke/UfromfpxTest.h
@@ -496,54 +496,54 @@ class UfromfpxTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-#define LIST_UFROMFPX_TESTS(T, func)                                           \
-  using LlvmLibcUfromfpxTest = UfromfpxTestTemplate<T>;                        \
-  TEST_F(LlvmLibcUfromfpxTest, SpecialNumbersNonzeroWidth) {                   \
+#define LIST_UFROMFPX_TESTS(Name, T, func)                                     \
+  using LlvmLibc##Name##Test = UfromfpxTestTemplate<T>;                        \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersNonzeroWidth) {                   \
     testSpecialNumbersNonzeroWidth(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, SpecialNumbersZeroWidth) {                      \
+  TEST_F(LlvmLibc##Name##Test, SpecialNumbersZeroWidth) {                      \
     testSpecialNumbersZeroWidth(&func);                                        \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, RoundedNumbersWithinRange) {                    \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersWithinRange) {                    \
     testRoundedNumbersWithinRange(&func);                                      \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, RoundedNumbersOutsideRange) {                   \
+  TEST_F(LlvmLibc##Name##Test, RoundedNumbersOutsideRange) {                   \
     testRoundedNumbersOutsideRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsUpwardWithinRange) {                   \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardWithinRange) {                   \
     testFractionsUpwardWithinRange(&func);                                     \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsUpwardOutsideRange) {                  \
+  TEST_F(LlvmLibc##Name##Test, FractionsUpwardOutsideRange) {                  \
     testFractionsUpwardOutsideRange(&func);                                    \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsDownwardWithinRange) {                 \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardWithinRange) {                 \
     testFractionsDownwardWithinRange(&func);                                   \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsDownwardOutsideRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsDownwardOutsideRange) {                \
     testFractionsDownwardOutsideRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsTowardZeroWithinRange) {               \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroWithinRange) {               \
     testFractionsTowardZeroWithinRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsTowardZeroOutsideRange) {              \
+  TEST_F(LlvmLibc##Name##Test, FractionsTowardZeroOutsideRange) {              \
     testFractionsTowardZeroOutsideRange(&func);                                \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestFromZeroWithinRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroWithinRange) {        \
     testFractionsToNearestFromZeroWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestFromZeroOutsideRange) {       \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFromZeroOutsideRange) {       \
     testFractionsToNearestFromZeroOutsideRange(&func);                         \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestWithinRange) {                \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestWithinRange) {                \
     testFractionsToNearestWithinRange(&func);                                  \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestOutsideRange) {               \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestOutsideRange) {               \
     testFractionsToNearestOutsideRange(&func);                                 \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestFallbackWithinRange) {        \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackWithinRange) {        \
     testFractionsToNearestFallbackWithinRange(&func);                          \
   }                                                                            \
-  TEST_F(LlvmLibcUfromfpxTest, FractionsToNearestFallbackOutsideRange) {       \
+  TEST_F(LlvmLibc##Name##Test, FractionsToNearestFallbackOutsideRange) {       \
     testFractionsToNearestFallbackOutsideRange(&func);                         \
   }
 
diff --git a/libc/test/src/math/smoke/bf16add_test.cpp b/libc/test/src/math/smoke/bf16add_test.cpp
index 9e9c594d7d7eb..8f9b6a745a778 100644
--- a/libc/test/src/math/smoke/bf16add_test.cpp
+++ b/libc/test/src/math/smoke/bf16add_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16add.h"
 
-LIST_ADD_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16add)
+LIST_ADD_TESTS(Bf16add, bfloat16, double, LIBC_NAMESPACE::bf16add)
diff --git a/libc/test/src/math/smoke/bf16addf128_test.cpp b/libc/test/src/math/smoke/bf16addf128_test.cpp
index 46f7ad329f237..74f3e22e4cc35 100644
--- a/libc/test/src/math/smoke/bf16addf128_test.cpp
+++ b/libc/test/src/math/smoke/bf16addf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addf128.h"
 
-LIST_ADD_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16addf128)
+LIST_ADD_TESTS(Bf16addf128, bfloat16, float128, LIBC_NAMESPACE::bf16addf128)
diff --git a/libc/test/src/math/smoke/bf16addf_test.cpp b/libc/test/src/math/smoke/bf16addf_test.cpp
index 06d56cf21ebd2..ff8f6da6f6113 100644
--- a/libc/test/src/math/smoke/bf16addf_test.cpp
+++ b/libc/test/src/math/smoke/bf16addf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addf.h"
 
-LIST_ADD_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16addf)
+LIST_ADD_TESTS(Bf16addf, bfloat16, float, LIBC_NAMESPACE::bf16addf)
diff --git a/libc/test/src/math/smoke/bf16addl_test.cpp b/libc/test/src/math/smoke/bf16addl_test.cpp
index bf548272d31c1..7ee75c02cd035 100644
--- a/libc/test/src/math/smoke/bf16addl_test.cpp
+++ b/libc/test/src/math/smoke/bf16addl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16addl.h"
 
-LIST_ADD_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16addl)
+LIST_ADD_TESTS(Bf16addl, bfloat16, long double, LIBC_NAMESPACE::bf16addl)
diff --git a/libc/test/src/math/smoke/bf16div_test.cpp b/libc/test/src/math/smoke/bf16div_test.cpp
index 4516351fb93a3..6be131b08e985 100644
--- a/libc/test/src/math/smoke/bf16div_test.cpp
+++ b/libc/test/src/math/smoke/bf16div_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16div.h"
 
-LIST_DIV_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16div)
+LIST_DIV_TESTS(Bf16div, bfloat16, double, LIBC_NAMESPACE::bf16div)
diff --git a/libc/test/src/math/smoke/bf16divf128_test.cpp b/libc/test/src/math/smoke/bf16divf128_test.cpp
index c42c5bb067050..adcb659688fc1 100644
--- a/libc/test/src/math/smoke/bf16divf128_test.cpp
+++ b/libc/test/src/math/smoke/bf16divf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divf128.h"
 
-LIST_DIV_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16divf128)
+LIST_DIV_TESTS(Bf16divf128, bfloat16, float128, LIBC_NAMESPACE::bf16divf128)
diff --git a/libc/test/src/math/smoke/bf16divf_test.cpp b/libc/test/src/math/smoke/bf16divf_test.cpp
index 873920b225a77..a18e6fafaf01b 100644
--- a/libc/test/src/math/smoke/bf16divf_test.cpp
+++ b/libc/test/src/math/smoke/bf16divf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divf.h"
 
-LIST_DIV_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16divf)
+LIST_DIV_TESTS(Bf16divf, bfloat16, float, LIBC_NAMESPACE::bf16divf)
diff --git a/libc/test/src/math/smoke/bf16divl_test.cpp b/libc/test/src/math/smoke/bf16divl_test.cpp
index 32ecd6228de0b..08dc8670faf05 100644
--- a/libc/test/src/math/smoke/bf16divl_test.cpp
+++ b/libc/test/src/math/smoke/bf16divl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16divl.h"
 
-LIST_DIV_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16divl)
+LIST_DIV_TESTS(Bf16divl, bfloat16, long double, LIBC_NAMESPACE::bf16divl)
diff --git a/libc/test/src/math/smoke/bf16fma_test.cpp b/libc/test/src/math/smoke/bf16fma_test.cpp
index 81c73a0cb6947..b0529385436dc 100644
--- a/libc/test/src/math/smoke/bf16fma_test.cpp
+++ b/libc/test/src/math/smoke/bf16fma_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fma.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16fma)
+LIST_NARROWING_FMA_TESTS(Bf16fma, bfloat16, double, LIBC_NAMESPACE::bf16fma)
diff --git a/libc/test/src/math/smoke/bf16fmaf128_test.cpp b/libc/test/src/math/smoke/bf16fmaf128_test.cpp
index dd8f4735c3497..251beaac95ad0 100644
--- a/libc/test/src/math/smoke/bf16fmaf128_test.cpp
+++ b/libc/test/src/math/smoke/bf16fmaf128_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmaf128.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16fmaf128)
+LIST_NARROWING_FMA_TESTS(Bf16fmaf128, bfloat16, float128,
+                         LIBC_NAMESPACE::bf16fmaf128)
diff --git a/libc/test/src/math/smoke/bf16fmaf_test.cpp b/libc/test/src/math/smoke/bf16fmaf_test.cpp
index 04c674892833a..76ee8f470074d 100644
--- a/libc/test/src/math/smoke/bf16fmaf_test.cpp
+++ b/libc/test/src/math/smoke/bf16fmaf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmaf.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16fmaf)
+LIST_NARROWING_FMA_TESTS(Bf16fmaf, bfloat16, float, LIBC_NAMESPACE::bf16fmaf)
diff --git a/libc/test/src/math/smoke/bf16fmal_test.cpp b/libc/test/src/math/smoke/bf16fmal_test.cpp
index 4c45e2c64312d..f2e9d60244ff5 100644
--- a/libc/test/src/math/smoke/bf16fmal_test.cpp
+++ b/libc/test/src/math/smoke/bf16fmal_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16fmal.h"
 
-LIST_NARROWING_FMA_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16fmal)
+LIST_NARROWING_FMA_TESTS(Bf16fmal, bfloat16, long double,
+                         LIBC_NAMESPACE::bf16fmal)
diff --git a/libc/test/src/math/smoke/bf16mul_test.cpp b/libc/test/src/math/smoke/bf16mul_test.cpp
index db6f0cb7844db..d571773f96732 100644
--- a/libc/test/src/math/smoke/bf16mul_test.cpp
+++ b/libc/test/src/math/smoke/bf16mul_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16mul.h"
 
-LIST_MUL_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16mul)
+LIST_MUL_TESTS(Bf16mul, bfloat16, double, LIBC_NAMESPACE::bf16mul)
diff --git a/libc/test/src/math/smoke/bf16mulf128_test.cpp b/libc/test/src/math/smoke/bf16mulf128_test.cpp
index 03cb9f24228ba..64e4fa36989f1 100644
--- a/libc/test/src/math/smoke/bf16mulf128_test.cpp
+++ b/libc/test/src/math/smoke/bf16mulf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16mulf128.h"
 
-LIST_MUL_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16mulf128)
+LIST_MUL_TESTS(Bf16mulf128, bfloat16, float128, LIBC_NAMESPACE::bf16mulf128)
diff --git a/libc/test/src/math/smoke/bf16mulf_test.cpp b/libc/test/src/math/smoke/bf16mulf_test.cpp
index ec40e98b20475..786a8186e8d81 100644
--- a/libc/test/src/math/smoke/bf16mulf_test.cpp
+++ b/libc/test/src/math/smoke/bf16mulf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16mulf.h"
 
-LIST_MUL_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16mulf)
+LIST_MUL_TESTS(Bf16mulf, bfloat16, float, LIBC_NAMESPACE::bf16mulf)
diff --git a/libc/test/src/math/smoke/bf16mull_test.cpp b/libc/test/src/math/smoke/bf16mull_test.cpp
index 4cb9c9c730aae..3b6b4a0769198 100644
--- a/libc/test/src/math/smoke/bf16mull_test.cpp
+++ b/libc/test/src/math/smoke/bf16mull_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16mull.h"
 
-LIST_MUL_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16mull)
+LIST_MUL_TESTS(Bf16mull, bfloat16, long double, LIBC_NAMESPACE::bf16mull)
diff --git a/libc/test/src/math/smoke/bf16sub_test.cpp b/libc/test/src/math/smoke/bf16sub_test.cpp
index 4a793dc493891..f0509ecd8b375 100644
--- a/libc/test/src/math/smoke/bf16sub_test.cpp
+++ b/libc/test/src/math/smoke/bf16sub_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16sub.h"
 
-LIST_SUB_TESTS(bfloat16, double, LIBC_NAMESPACE::bf16sub)
+LIST_SUB_TESTS(Bf16sub, bfloat16, double, LIBC_NAMESPACE::bf16sub)
diff --git a/libc/test/src/math/smoke/bf16subf128_test.cpp b/libc/test/src/math/smoke/bf16subf128_test.cpp
index 25d6711f71346..66efe06fe7c97 100644
--- a/libc/test/src/math/smoke/bf16subf128_test.cpp
+++ b/libc/test/src/math/smoke/bf16subf128_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subf128.h"
 
-LIST_SUB_TESTS(bfloat16, float128, LIBC_NAMESPACE::bf16subf128)
+LIST_SUB_TESTS(Bf16subf128, bfloat16, float128, LIBC_NAMESPACE::bf16subf128)
diff --git a/libc/test/src/math/smoke/bf16subf_test.cpp b/libc/test/src/math/smoke/bf16subf_test.cpp
index e8c7440230f1d..1429e0d3d76d4 100644
--- a/libc/test/src/math/smoke/bf16subf_test.cpp
+++ b/libc/test/src/math/smoke/bf16subf_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subf.h"
 
-LIST_SUB_TESTS(bfloat16, float, LIBC_NAMESPACE::bf16subf)
+LIST_SUB_TESTS(Bf16subf, bfloat16, float, LIBC_NAMESPACE::bf16subf)
diff --git a/libc/test/src/math/smoke/bf16subl_test.cpp b/libc/test/src/math/smoke/bf16subl_test.cpp
index 299736949d713..aa60fbcdbbf89 100644
--- a/libc/test/src/math/smoke/bf16subl_test.cpp
+++ b/libc/test/src/math/smoke/bf16subl_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/bf16subl.h"
 
-LIST_SUB_TESTS(bfloat16, long double, LIBC_NAMESPACE::bf16subl)
+LIST_SUB_TESTS(Bf16subl, bfloat16, long double, LIBC_NAMESPACE::bf16subl)
diff --git a/libc/test/src/math/smoke/bfloat16_add_test.cpp b/libc/test/src/math/smoke/bfloat16_add_test.cpp
index 1db65a9be2b84..81e6b32d15522 100644
--- a/libc/test/src/math/smoke/bfloat16_add_test.cpp
+++ b/libc/test/src/math/smoke/bfloat16_add_test.cpp
@@ -12,4 +12,4 @@
 
 static bfloat16 add_func(bfloat16 x, bfloat16 y) { return x + y; }
 
-LIST_ADD_TESTS(bfloat16, bfloat16, add_func)
+LIST_ADD_TESTS(Bfloat16Add, bfloat16, bfloat16, add_func)
diff --git a/libc/test/src/math/smoke/bfloat16_div_test.cpp b/libc/test/src/math/smoke/bfloat16_div_test.cpp
index c1ab598df0608..d97cb3a572e0b 100644
--- a/libc/test/src/math/smoke/bfloat16_div_test.cpp
+++ b/libc/test/src/math/smoke/bfloat16_div_test.cpp
@@ -12,4 +12,4 @@
 
 static bfloat16 div_func(bfloat16 x, bfloat16 y) { return x / y; }
 
-LIST_DIV_TESTS(bfloat16, bfloat16, div_func)
+LIST_DIV_TESTS(Bfloat16Div, bfloat16, bfloat16, div_func)
diff --git a/libc/test/src/math/smoke/bfloat16_mul_test.cpp b/libc/test/src/math/smoke/bfloat16_mul_test.cpp
index 03e38d8b8e97a..afabae7ffcd4c 100644
--- a/libc/test/src/math/smoke/bfloat16_mul_test.cpp
+++ b/libc/test/src/math/smoke/bfloat16_mul_test.cpp
@@ -12,4 +12,4 @@
 
 static bfloat16 mul_func(bfloat16 x, bfloat16 y) { return x * y; }
 
-LIST_MUL_TESTS(bfloat16, bfloat16, mul_func)
+LIST_MUL_TESTS(Bfloat16Mul, bfloat16, bfloat16, mul_func)
diff --git a/libc/test/src/math/smoke/bfloat16_sub_test.cpp b/libc/test/src/math/smoke/bfloat16_sub_test.cpp
index 5eb4a9b7d062a..6903481867005 100644
--- a/libc/test/src/math/smoke/bfloat16_sub_test.cpp
+++ b/libc/test/src/math/smoke/bfloat16_sub_test.cpp
@@ -12,4 +12,4 @@
 
 static bfloat16 sub_func(bfloat16 x, bfloat16 y) { return x - y; }
 
-LIST_SUB_TESTS(bfloat16, bfloat16, sub_func)
+LIST_SUB_TESTS(Bfloat16Sub, bfloat16, bfloat16, sub_func)
diff --git a/libc/test/src/math/smoke/canonicalize_test.cpp b/libc/test/src/math/smoke/canonicalize_test.cpp
index 54a1ddd49ca4b..30ecc4c3479a6 100644
--- a/libc/test/src/math/smoke/canonicalize_test.cpp
+++ b/libc/test/src/math/smoke/canonicalize_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/canonicalize.h"
 
-LIST_CANONICALIZE_TESTS(double, LIBC_NAMESPACE::canonicalize)
+LIST_CANONICALIZE_TESTS(Canonicalize, double, LIBC_NAMESPACE::canonicalize)
diff --git a/libc/test/src/math/smoke/canonicalizebf16_test.cpp b/libc/test/src/math/smoke/canonicalizebf16_test.cpp
index bf955c26ebc4f..be378587d7750 100644
--- a/libc/test/src/math/smoke/canonicalizebf16_test.cpp
+++ b/libc/test/src/math/smoke/canonicalizebf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/canonicalizebf16.h"
 
-LIST_CANONICALIZE_TESTS(bfloat16, LIBC_NAMESPACE::canonicalizebf16)
+LIST_CANONICALIZE_TESTS(Canonicalizebf16, bfloat16,
+                        LIBC_NAMESPACE::canonicalizebf16)
diff --git a/libc/test/src/math/smoke/canonicalizef128_test.cpp b/libc/test/src/math/smoke/canonicalizef128_test.cpp
index 242e2331a29ea..f9f3c3dda8fcb 100644
--- a/libc/test/src/math/smoke/canonicalizef128_test.cpp
+++ b/libc/test/src/math/smoke/canonicalizef128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/canonicalizef128.h"
 
-LIST_CANONICALIZE_TESTS(float128, LIBC_NAMESPACE::canonicalizef128)
+LIST_CANONICALIZE_TESTS(Canonicalizef128, float128,
+                        LIBC_NAMESPACE::canonicalizef128)
diff --git a/libc/test/src/math/smoke/canonicalizef16_test.cpp b/libc/test/src/math/smoke/canonicalizef16_test.cpp
index 32a3d1756e4da..b66a05a754599 100644
--- a/libc/test/src/math/smoke/canonicalizef16_test.cpp
+++ b/libc/test/src/math/smoke/canonicalizef16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/canonicalizef16.h"
 
-LIST_CANONICALIZE_TESTS(float16, LIBC_NAMESPACE::canonicalizef16)
+LIST_CANONICALIZE_TESTS(Canonicalizef16, float16,
+                        LIBC_NAMESPACE::canonicalizef16)
diff --git a/libc/test/src/math/smoke/canonicalizef_test.cpp b/libc/test/src/math/smoke/canonicalizef_test.cpp
index 17cf3c3639a4a..a2ab495b61259 100644
--- a/libc/test/src/math/smoke/canonicalizef_test.cpp
+++ b/libc/test/src/math/smoke/canonicalizef_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/canonicalizef.h"
 
-LIST_CANONICALIZE_TESTS(float, LIBC_NAMESPACE::canonicalizef)
+LIST_CANONICALIZE_TESTS(Canonicalizef, float, LIBC_NAMESPACE::canonicalizef)
diff --git a/libc/test/src/math/smoke/canonicalizel_test.cpp b/libc/test/src/math/smoke/canonicalizel_test.cpp
index 23cb21dce84ea..f3549ea529b97 100644
--- a/libc/test/src/math/smoke/canonicalizel_test.cpp
+++ b/libc/test/src/math/smoke/canonicalizel_test.cpp
@@ -10,10 +10,12 @@
 
 #include "src/math/canonicalizel.h"
 
-LIST_CANONICALIZE_TESTS(long double, LIBC_NAMESPACE::canonicalizel)
+LIST_CANONICALIZE_TESTS(Canonicalizel, long double,
+                        LIBC_NAMESPACE::canonicalizel)
 
 #ifdef LIBC_TYPES_LONG_DOUBLE_IS_X86_FLOAT80
 
-X86_80_SPECIAL_CANONICALIZE_TEST(long double, LIBC_NAMESPACE::canonicalizel)
+X86_80_SPECIAL_CANONICALIZE_TEST(Canonicalizel, long double,
+                                 LIBC_NAMESPACE::canonicalizel)
 
 #endif // LIBC_TYPES_LONG_DOUBLE_IS_X86_FLOAT80
diff --git a/libc/test/src/math/smoke/cbrtf16_test.cpp b/libc/test/src/math/smoke/cbrtf16_test.cpp
index 7c8a7103273a0..2caf1e6beacb2 100644
--- a/libc/test/src/math/smoke/cbrtf16_test.cpp
+++ b/libc/test/src/math/smoke/cbrtf16_test.cpp
@@ -10,11 +10,11 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-using LlvmLibcCbrtfTest = LIBC_NAMESPACE::testing::FPTest<float16>;
+using LlvmLibcCbrtf16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
 
 using LIBC_NAMESPACE::testing::tlog;
 
-TEST_F(LlvmLibcCbrtfTest, SpecialNumbers) {
+TEST_F(LlvmLibcCbrtf16Test, SpecialNumbers) {
   EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::cbrtf16(aNaN));
   EXPECT_FP_EQ_ALL_ROUNDING(inf, LIBC_NAMESPACE::cbrtf16(inf));
   EXPECT_FP_EQ_ALL_ROUNDING(neg_inf, LIBC_NAMESPACE::cbrtf16(neg_inf));
diff --git a/libc/test/src/math/smoke/ceil_test.cpp b/libc/test/src/math/smoke/ceil_test.cpp
index 800452a43426c..1223e3d404266 100644
--- a/libc/test/src/math/smoke/ceil_test.cpp
+++ b/libc/test/src/math/smoke/ceil_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceil.h"
 
-LIST_CEIL_TESTS(double, LIBC_NAMESPACE::ceil)
+LIST_CEIL_TESTS(Ceil, double, LIBC_NAMESPACE::ceil)
diff --git a/libc/test/src/math/smoke/ceilbf16_test.cpp b/libc/test/src/math/smoke/ceilbf16_test.cpp
index dcaf058344ff0..3777b69f4ee16 100644
--- a/libc/test/src/math/smoke/ceilbf16_test.cpp
+++ b/libc/test/src/math/smoke/ceilbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ceilbf16.h"
 
-LIST_CEIL_TESTS(bfloat16, LIBC_NAMESPACE::ceilbf16)
+LIST_CEIL_TESTS(Ceilbf16, bfloat16, LIBC_NAMESPACE::ceilbf16)
diff --git a/libc/test/src/math/smoke/ceilf128_test.cpp b/libc/test/src/math/smoke/ceilf128_test.cpp
index ba5a768610a65..3612f16d0a1eb 100644
--- a/libc/test/src/math/smoke/ceilf128_test.cpp
+++ b/libc/test/src/math/smoke/ceilf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_CEIL_TESTS(float128, LIBC_NAMESPACE::ceilf128)
+LIST_CEIL_TESTS(Ceilf128, float128, LIBC_NAMESPACE::ceilf128)
diff --git a/libc/test/src/math/smoke/ceilf16_test.cpp b/libc/test/src/math/smoke/ceilf16_test.cpp
index a6ec922836a75..402834bd9b629 100644
--- a/libc/test/src/math/smoke/ceilf16_test.cpp
+++ b/libc/test/src/math/smoke/ceilf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceilf16.h"
 
-LIST_CEIL_TESTS(float16, LIBC_NAMESPACE::ceilf16)
+LIST_CEIL_TESTS(Ceilf16, float16, LIBC_NAMESPACE::ceilf16)
diff --git a/libc/test/src/math/smoke/ceilf_test.cpp b/libc/test/src/math/smoke/ceilf_test.cpp
index 2a2504228adb0..e731bd2e89ec3 100644
--- a/libc/test/src/math/smoke/ceilf_test.cpp
+++ b/libc/test/src/math/smoke/ceilf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceilf.h"
 
-LIST_CEIL_TESTS(float, LIBC_NAMESPACE::ceilf)
+LIST_CEIL_TESTS(Ceilf, float, LIBC_NAMESPACE::ceilf)
diff --git a/libc/test/src/math/smoke/ceill_test.cpp b/libc/test/src/math/smoke/ceill_test.cpp
index 0f766602a0f6d..353c8dc570eba 100644
--- a/libc/test/src/math/smoke/ceill_test.cpp
+++ b/libc/test/src/math/smoke/ceill_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ceill.h"
 
-LIST_CEIL_TESTS(long double, LIBC_NAMESPACE::ceill)
+LIST_CEIL_TESTS(Ceill, long double, LIBC_NAMESPACE::ceill)
diff --git a/libc/test/src/math/smoke/copysign_test.cpp b/libc/test/src/math/smoke/copysign_test.cpp
index 5b3d812c02da4..9bf436b5ae3e1 100644
--- a/libc/test/src/math/smoke/copysign_test.cpp
+++ b/libc/test/src/math/smoke/copysign_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysign.h"
 
-LIST_COPYSIGN_TESTS(double, LIBC_NAMESPACE::copysign)
+LIST_COPYSIGN_TESTS(Copysign, double, LIBC_NAMESPACE::copysign)
diff --git a/libc/test/src/math/smoke/copysignbf16_test.cpp b/libc/test/src/math/smoke/copysignbf16_test.cpp
index 71a97e37a7491..dc0d102ba9ece 100644
--- a/libc/test/src/math/smoke/copysignbf16_test.cpp
+++ b/libc/test/src/math/smoke/copysignbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/copysignbf16.h"
 
-LIST_COPYSIGN_TESTS(bfloat16, LIBC_NAMESPACE::copysignbf16)
+LIST_COPYSIGN_TESTS(Copysignbf16, bfloat16, LIBC_NAMESPACE::copysignbf16)
diff --git a/libc/test/src/math/smoke/copysignf128_test.cpp b/libc/test/src/math/smoke/copysignf128_test.cpp
index 33a04ff65c7c6..4503ddc6cc949 100644
--- a/libc/test/src/math/smoke/copysignf128_test.cpp
+++ b/libc/test/src/math/smoke/copysignf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_COPYSIGN_TESTS(float128, LIBC_NAMESPACE::copysignf128)
+LIST_COPYSIGN_TESTS(Copysignf128, float128, LIBC_NAMESPACE::copysignf128)
diff --git a/libc/test/src/math/smoke/copysignf16_test.cpp b/libc/test/src/math/smoke/copysignf16_test.cpp
index 80a67f1d79ee6..28c4190872c51 100644
--- a/libc/test/src/math/smoke/copysignf16_test.cpp
+++ b/libc/test/src/math/smoke/copysignf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysignf16.h"
 
-LIST_COPYSIGN_TESTS(float16, LIBC_NAMESPACE::copysignf16)
+LIST_COPYSIGN_TESTS(Copysignf16, float16, LIBC_NAMESPACE::copysignf16)
diff --git a/libc/test/src/math/smoke/copysignf_test.cpp b/libc/test/src/math/smoke/copysignf_test.cpp
index 344ffee2359ec..201a386a57e7f 100644
--- a/libc/test/src/math/smoke/copysignf_test.cpp
+++ b/libc/test/src/math/smoke/copysignf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysignf.h"
 
-LIST_COPYSIGN_TESTS(float, LIBC_NAMESPACE::copysignf)
+LIST_COPYSIGN_TESTS(Copysignf, float, LIBC_NAMESPACE::copysignf)
diff --git a/libc/test/src/math/smoke/copysignl_test.cpp b/libc/test/src/math/smoke/copysignl_test.cpp
index bed60678dc161..595ba7e910ff4 100644
--- a/libc/test/src/math/smoke/copysignl_test.cpp
+++ b/libc/test/src/math/smoke/copysignl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/copysignl.h"
 
-LIST_COPYSIGN_TESTS(long double, LIBC_NAMESPACE::copysignl)
+LIST_COPYSIGN_TESTS(Copysignl, long double, LIBC_NAMESPACE::copysignl)
diff --git a/libc/test/src/math/smoke/daddf128_test.cpp b/libc/test/src/math/smoke/daddf128_test.cpp
index ca0bbffe73451..6595f0e4f068a 100644
--- a/libc/test/src/math/smoke/daddf128_test.cpp
+++ b/libc/test/src/math/smoke/daddf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/daddf128.h"
 
-LIST_ADD_TESTS(double, float128, LIBC_NAMESPACE::daddf128)
+LIST_ADD_TESTS(Daddf128, double, float128, LIBC_NAMESPACE::daddf128)
diff --git a/libc/test/src/math/smoke/daddl_test.cpp b/libc/test/src/math/smoke/daddl_test.cpp
index 7a34d962d5207..39fa66cb97135 100644
--- a/libc/test/src/math/smoke/daddl_test.cpp
+++ b/libc/test/src/math/smoke/daddl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/daddl.h"
 
-LIST_ADD_TESTS(double, long double, LIBC_NAMESPACE::daddl)
+LIST_ADD_TESTS(Daddl, double, long double, LIBC_NAMESPACE::daddl)
diff --git a/libc/test/src/math/smoke/ddivf128_test.cpp b/libc/test/src/math/smoke/ddivf128_test.cpp
index b5f39154b0e84..28aae17af28c3 100644
--- a/libc/test/src/math/smoke/ddivf128_test.cpp
+++ b/libc/test/src/math/smoke/ddivf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ddivf128.h"
 
-LIST_DIV_TESTS(double, float128, LIBC_NAMESPACE::ddivf128)
+LIST_DIV_TESTS(Ddivf128, double, float128, LIBC_NAMESPACE::ddivf128)
diff --git a/libc/test/src/math/smoke/ddivl_test.cpp b/libc/test/src/math/smoke/ddivl_test.cpp
index 7768766e30c12..22fe0306b3264 100644
--- a/libc/test/src/math/smoke/ddivl_test.cpp
+++ b/libc/test/src/math/smoke/ddivl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ddivl.h"
 
-LIST_DIV_TESTS(double, long double, LIBC_NAMESPACE::ddivl)
+LIST_DIV_TESTS(Ddivl, double, long double, LIBC_NAMESPACE::ddivl)
diff --git a/libc/test/src/math/smoke/dfmaf128_test.cpp b/libc/test/src/math/smoke/dfmaf128_test.cpp
index 56c11747047b1..fcf9670ed33af 100644
--- a/libc/test/src/math/smoke/dfmaf128_test.cpp
+++ b/libc/test/src/math/smoke/dfmaf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dfmaf128.h"
 
-LIST_NARROWING_FMA_TESTS(double, float128, LIBC_NAMESPACE::dfmaf128)
+LIST_NARROWING_FMA_TESTS(Dfmaf128, double, float128, LIBC_NAMESPACE::dfmaf128)
diff --git a/libc/test/src/math/smoke/dfmal_test.cpp b/libc/test/src/math/smoke/dfmal_test.cpp
index 3c38f5eb7db9d..e6c92d6ce1025 100644
--- a/libc/test/src/math/smoke/dfmal_test.cpp
+++ b/libc/test/src/math/smoke/dfmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dfmal.h"
 
-LIST_NARROWING_FMA_TESTS(double, long double, LIBC_NAMESPACE::dfmal)
+LIST_NARROWING_FMA_TESTS(Dfmal, double, long double, LIBC_NAMESPACE::dfmal)
diff --git a/libc/test/src/math/smoke/dmulf128_test.cpp b/libc/test/src/math/smoke/dmulf128_test.cpp
index 2ee2d10b9a19b..2d7fec12eb985 100644
--- a/libc/test/src/math/smoke/dmulf128_test.cpp
+++ b/libc/test/src/math/smoke/dmulf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dmulf128.h"
 
-LIST_MUL_TESTS(double, float128, LIBC_NAMESPACE::dmulf128)
+LIST_MUL_TESTS(Dmulf128, double, float128, LIBC_NAMESPACE::dmulf128)
diff --git a/libc/test/src/math/smoke/dmull_test.cpp b/libc/test/src/math/smoke/dmull_test.cpp
index 1b9c9c2c24ed3..0e095323382fe 100644
--- a/libc/test/src/math/smoke/dmull_test.cpp
+++ b/libc/test/src/math/smoke/dmull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dmull.h"
 
-LIST_MUL_TESTS(double, long double, LIBC_NAMESPACE::dmull)
+LIST_MUL_TESTS(Dmull, double, long double, LIBC_NAMESPACE::dmull)
diff --git a/libc/test/src/math/smoke/dsqrtf128_test.cpp b/libc/test/src/math/smoke/dsqrtf128_test.cpp
index 6f98d1cfc6042..9a518aa7336f5 100644
--- a/libc/test/src/math/smoke/dsqrtf128_test.cpp
+++ b/libc/test/src/math/smoke/dsqrtf128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/dsqrtf128.h"
 
-LIST_NARROWING_SQRT_TESTS(double, float128, LIBC_NAMESPACE::dsqrtf128)
+LIST_NARROWING_SQRT_TESTS(Dsqrtf128, double, float128,
+                          LIBC_NAMESPACE::dsqrtf128)
diff --git a/libc/test/src/math/smoke/dsqrtl_test.cpp b/libc/test/src/math/smoke/dsqrtl_test.cpp
index c178e389a57cd..58502bd89da51 100644
--- a/libc/test/src/math/smoke/dsqrtl_test.cpp
+++ b/libc/test/src/math/smoke/dsqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dsqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(double, long double, LIBC_NAMESPACE::dsqrtl)
+LIST_NARROWING_SQRT_TESTS(Dsqrtl, double, long double, LIBC_NAMESPACE::dsqrtl)
diff --git a/libc/test/src/math/smoke/dsubf128_test.cpp b/libc/test/src/math/smoke/dsubf128_test.cpp
index e496cdd245070..9b35c02548b6e 100644
--- a/libc/test/src/math/smoke/dsubf128_test.cpp
+++ b/libc/test/src/math/smoke/dsubf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dsubf128.h"
 
-LIST_SUB_TESTS(double, float128, LIBC_NAMESPACE::dsubf128)
+LIST_SUB_TESTS(Dsubf128, double, float128, LIBC_NAMESPACE::dsubf128)
diff --git a/libc/test/src/math/smoke/dsubl_test.cpp b/libc/test/src/math/smoke/dsubl_test.cpp
index 98846e0b6e3b3..5ccacf81b4546 100644
--- a/libc/test/src/math/smoke/dsubl_test.cpp
+++ b/libc/test/src/math/smoke/dsubl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/dsubl.h"
 
-LIST_SUB_TESTS(double, long double, LIBC_NAMESPACE::dsubl)
+LIST_SUB_TESTS(Dsubl, double, long double, LIBC_NAMESPACE::dsubl)
diff --git a/libc/test/src/math/smoke/erff16_test.cpp b/libc/test/src/math/smoke/erff16_test.cpp
index 71a6814fb5761..c232cefe72534 100644
--- a/libc/test/src/math/smoke/erff16_test.cpp
+++ b/libc/test/src/math/smoke/erff16_test.cpp
@@ -12,9 +12,9 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-using LlvmLibcErffTest = LIBC_NAMESPACE::testing::FPTest<float16>;
+using LlvmLibcErff16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
 
-TEST_F(LlvmLibcErffTest, SpecialNumbers) {
+TEST_F(LlvmLibcErff16Test, SpecialNumbers) {
   EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::erff16(sNaN), FE_INVALID);
   EXPECT_MATH_ERRNO(0);
 
@@ -29,19 +29,19 @@ TEST_F(LlvmLibcErffTest, SpecialNumbers) {
 
 using namespace LIBC_NAMESPACE::testing;
 
-TEST_F(LlvmLibcErffTest, FTZMode) {
+TEST_F(LlvmLibcErff16Test, FTZMode) {
   ModifyMXCSR mxcsr(FTZ);
   EXPECT_FP_EQ(0x1p-24f16, LIBC_NAMESPACE::erff16(min_denormal));
   EXPECT_FP_EQ(0x1.208p-14f16, LIBC_NAMESPACE::erff16(max_denormal));
 }
 
-TEST_F(LlvmLibcErffTest, DAZMode) {
+TEST_F(LlvmLibcErff16Test, DAZMode) {
   ModifyMXCSR mxcsr(DAZ);
   EXPECT_FP_EQ(0x1p-24f16, LIBC_NAMESPACE::erff16(min_denormal));
   EXPECT_FP_EQ(0x1.208p-14f16, LIBC_NAMESPACE::erff16(max_denormal));
 }
 
-TEST_F(LlvmLibcErffTest, FTZDAZMode) {
+TEST_F(LlvmLibcErff16Test, FTZDAZMode) {
   ModifyMXCSR mxcsr(FTZ | DAZ);
 
   EXPECT_FP_EQ(0x1p-24f16, LIBC_NAMESPACE::erff16(min_denormal));
diff --git a/libc/test/src/math/smoke/expbf16_test.cpp b/libc/test/src/math/smoke/expbf16_test.cpp
index 04526bebc4685..67e04916d1710 100644
--- a/libc/test/src/math/smoke/expbf16_test.cpp
+++ b/libc/test/src/math/smoke/expbf16_test.cpp
@@ -14,7 +14,7 @@
 #include "test/UnitTest/FEnvSafeTest.h"
 #include "test/UnitTest/FPMatcher.h"
 
-class LlvmLibcExpf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+class LlvmLibcExpbf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   DECLARE_SPECIAL_CONSTANTS(bfloat16)
 public:
   void test_special_numbers() {
@@ -64,6 +64,6 @@ class LlvmLibcExpf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-TEST_F(LlvmLibcExpf16Test, SpecialNumbers) { test_special_numbers(); }
-TEST_F(LlvmLibcExpf16Test, Overflow) { test_overflow(); }
-TEST_F(LlvmLibcExpf16Test, Undeflow) { test_underflow(); }
+TEST_F(LlvmLibcExpbf16Test, SpecialNumbers) { test_special_numbers(); }
+TEST_F(LlvmLibcExpbf16Test, Overflow) { test_overflow(); }
+TEST_F(LlvmLibcExpbf16Test, Undeflow) { test_underflow(); }
diff --git a/libc/test/src/math/smoke/f16add_test.cpp b/libc/test/src/math/smoke/f16add_test.cpp
index c47ece2a92555..df8907bf8b1b8 100644
--- a/libc/test/src/math/smoke/f16add_test.cpp
+++ b/libc/test/src/math/smoke/f16add_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16add.h"
 
-LIST_ADD_TESTS(float16, double, LIBC_NAMESPACE::f16add)
+LIST_ADD_TESTS(F16add, float16, double, LIBC_NAMESPACE::f16add)
diff --git a/libc/test/src/math/smoke/f16addf128_test.cpp b/libc/test/src/math/smoke/f16addf128_test.cpp
index 8ed123b4ff1e8..dd6a7ca03ce35 100644
--- a/libc/test/src/math/smoke/f16addf128_test.cpp
+++ b/libc/test/src/math/smoke/f16addf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16addf128.h"
 
-LIST_ADD_TESTS(float16, float128, LIBC_NAMESPACE::f16addf128)
+LIST_ADD_TESTS(F16addf128, float16, float128, LIBC_NAMESPACE::f16addf128)
diff --git a/libc/test/src/math/smoke/f16addf_test.cpp b/libc/test/src/math/smoke/f16addf_test.cpp
index 1e8b4323114ad..416eb3d68794a 100644
--- a/libc/test/src/math/smoke/f16addf_test.cpp
+++ b/libc/test/src/math/smoke/f16addf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16addf.h"
 
-LIST_ADD_TESTS(float16, float, LIBC_NAMESPACE::f16addf)
+LIST_ADD_TESTS(F16addf, float16, float, LIBC_NAMESPACE::f16addf)
diff --git a/libc/test/src/math/smoke/f16addl_test.cpp b/libc/test/src/math/smoke/f16addl_test.cpp
index f8e0d9ba6b4de..902057f745b33 100644
--- a/libc/test/src/math/smoke/f16addl_test.cpp
+++ b/libc/test/src/math/smoke/f16addl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16addl.h"
 
-LIST_ADD_TESTS(float16, long double, LIBC_NAMESPACE::f16addl)
+LIST_ADD_TESTS(F16addl, float16, long double, LIBC_NAMESPACE::f16addl)
diff --git a/libc/test/src/math/smoke/f16div_test.cpp b/libc/test/src/math/smoke/f16div_test.cpp
index 0bfa69f9b8028..cc9fd57ae2bf0 100644
--- a/libc/test/src/math/smoke/f16div_test.cpp
+++ b/libc/test/src/math/smoke/f16div_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16div.h"
 
-LIST_DIV_TESTS(float16, double, LIBC_NAMESPACE::f16div)
+LIST_DIV_TESTS(F16div, float16, double, LIBC_NAMESPACE::f16div)
diff --git a/libc/test/src/math/smoke/f16divf128_test.cpp b/libc/test/src/math/smoke/f16divf128_test.cpp
index d2ea971824621..a9e177eddf88b 100644
--- a/libc/test/src/math/smoke/f16divf128_test.cpp
+++ b/libc/test/src/math/smoke/f16divf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16divf128.h"
 
-LIST_DIV_TESTS(float16, float128, LIBC_NAMESPACE::f16divf128)
+LIST_DIV_TESTS(F16divf128, float16, float128, LIBC_NAMESPACE::f16divf128)
diff --git a/libc/test/src/math/smoke/f16divf_test.cpp b/libc/test/src/math/smoke/f16divf_test.cpp
index 85be1ebcd55c9..8db88d8191090 100644
--- a/libc/test/src/math/smoke/f16divf_test.cpp
+++ b/libc/test/src/math/smoke/f16divf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16divf.h"
 
-LIST_DIV_TESTS(float16, float, LIBC_NAMESPACE::f16divf)
+LIST_DIV_TESTS(F16divf, float16, float, LIBC_NAMESPACE::f16divf)
diff --git a/libc/test/src/math/smoke/f16divl_test.cpp b/libc/test/src/math/smoke/f16divl_test.cpp
index bad3e70a477b4..f841b8346a91e 100644
--- a/libc/test/src/math/smoke/f16divl_test.cpp
+++ b/libc/test/src/math/smoke/f16divl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16divl.h"
 
-LIST_DIV_TESTS(float16, long double, LIBC_NAMESPACE::f16divl)
+LIST_DIV_TESTS(F16divl, float16, long double, LIBC_NAMESPACE::f16divl)
diff --git a/libc/test/src/math/smoke/f16fma_test.cpp b/libc/test/src/math/smoke/f16fma_test.cpp
index 2e46b5bdd4682..21693ee52ba36 100644
--- a/libc/test/src/math/smoke/f16fma_test.cpp
+++ b/libc/test/src/math/smoke/f16fma_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fma.h"
 
-LIST_NARROWING_FMA_TESTS(float16, double, LIBC_NAMESPACE::f16fma)
+LIST_NARROWING_FMA_TESTS(F16fma, float16, double, LIBC_NAMESPACE::f16fma)
diff --git a/libc/test/src/math/smoke/f16fmaf128_test.cpp b/libc/test/src/math/smoke/f16fmaf128_test.cpp
index ea4003bc5f77e..a40433d5f0cd7 100644
--- a/libc/test/src/math/smoke/f16fmaf128_test.cpp
+++ b/libc/test/src/math/smoke/f16fmaf128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/f16fmaf128.h"
 
-LIST_NARROWING_FMA_TESTS(float16, float128, LIBC_NAMESPACE::f16fmaf128)
+LIST_NARROWING_FMA_TESTS(F16fmaf128, float16, float128,
+                         LIBC_NAMESPACE::f16fmaf128)
diff --git a/libc/test/src/math/smoke/f16fmaf_test.cpp b/libc/test/src/math/smoke/f16fmaf_test.cpp
index 5e3aec768c191..62ff601e1b94b 100644
--- a/libc/test/src/math/smoke/f16fmaf_test.cpp
+++ b/libc/test/src/math/smoke/f16fmaf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fmaf.h"
 
-LIST_NARROWING_FMA_TESTS(float16, float, LIBC_NAMESPACE::f16fmaf)
+LIST_NARROWING_FMA_TESTS(F16fmaf, float16, float, LIBC_NAMESPACE::f16fmaf)
diff --git a/libc/test/src/math/smoke/f16fmal_test.cpp b/libc/test/src/math/smoke/f16fmal_test.cpp
index 5394268a9cd8f..1af1d47040621 100644
--- a/libc/test/src/math/smoke/f16fmal_test.cpp
+++ b/libc/test/src/math/smoke/f16fmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16fmal.h"
 
-LIST_NARROWING_FMA_TESTS(float16, long double, LIBC_NAMESPACE::f16fmal)
+LIST_NARROWING_FMA_TESTS(F16fmal, float16, long double, LIBC_NAMESPACE::f16fmal)
diff --git a/libc/test/src/math/smoke/f16mul_test.cpp b/libc/test/src/math/smoke/f16mul_test.cpp
index 49b443870c483..5078758a2ff51 100644
--- a/libc/test/src/math/smoke/f16mul_test.cpp
+++ b/libc/test/src/math/smoke/f16mul_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mul.h"
 
-LIST_MUL_TESTS(float16, double, LIBC_NAMESPACE::f16mul)
+LIST_MUL_TESTS(F16mul, float16, double, LIBC_NAMESPACE::f16mul)
diff --git a/libc/test/src/math/smoke/f16mulf128_test.cpp b/libc/test/src/math/smoke/f16mulf128_test.cpp
index 46e52cf068a7b..7434bda9c02bd 100644
--- a/libc/test/src/math/smoke/f16mulf128_test.cpp
+++ b/libc/test/src/math/smoke/f16mulf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mulf128.h"
 
-LIST_MUL_TESTS(float16, float128, LIBC_NAMESPACE::f16mulf128)
+LIST_MUL_TESTS(F16mulf128, float16, float128, LIBC_NAMESPACE::f16mulf128)
diff --git a/libc/test/src/math/smoke/f16mulf_test.cpp b/libc/test/src/math/smoke/f16mulf_test.cpp
index bf2530863621d..a5aa916142c1a 100644
--- a/libc/test/src/math/smoke/f16mulf_test.cpp
+++ b/libc/test/src/math/smoke/f16mulf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mulf.h"
 
-LIST_MUL_TESTS(float16, float, LIBC_NAMESPACE::f16mulf)
+LIST_MUL_TESTS(F16mulf, float16, float, LIBC_NAMESPACE::f16mulf)
diff --git a/libc/test/src/math/smoke/f16mull_test.cpp b/libc/test/src/math/smoke/f16mull_test.cpp
index 5292ddb87b7f4..739c1e81087bd 100644
--- a/libc/test/src/math/smoke/f16mull_test.cpp
+++ b/libc/test/src/math/smoke/f16mull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16mull.h"
 
-LIST_MUL_TESTS(float16, long double, LIBC_NAMESPACE::f16mull)
+LIST_MUL_TESTS(F16mull, float16, long double, LIBC_NAMESPACE::f16mull)
diff --git a/libc/test/src/math/smoke/f16sqrt_test.cpp b/libc/test/src/math/smoke/f16sqrt_test.cpp
index 759b388ad3b3d..e18fc6af96ca1 100644
--- a/libc/test/src/math/smoke/f16sqrt_test.cpp
+++ b/libc/test/src/math/smoke/f16sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sqrt.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, double, LIBC_NAMESPACE::f16sqrt)
+LIST_NARROWING_SQRT_TESTS(F16sqrt, float16, double, LIBC_NAMESPACE::f16sqrt)
diff --git a/libc/test/src/math/smoke/f16sqrtf128_test.cpp b/libc/test/src/math/smoke/f16sqrtf128_test.cpp
index 31c994860dcd8..26a290354202e 100644
--- a/libc/test/src/math/smoke/f16sqrtf128_test.cpp
+++ b/libc/test/src/math/smoke/f16sqrtf128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/f16sqrtf128.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, float128, LIBC_NAMESPACE::f16sqrtf128)
+LIST_NARROWING_SQRT_TESTS(F16sqrtf128, float16, float128,
+                          LIBC_NAMESPACE::f16sqrtf128)
diff --git a/libc/test/src/math/smoke/f16sqrtf_test.cpp b/libc/test/src/math/smoke/f16sqrtf_test.cpp
index 36231aeb4184d..2b654aa0601ea 100644
--- a/libc/test/src/math/smoke/f16sqrtf_test.cpp
+++ b/libc/test/src/math/smoke/f16sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sqrtf.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, float, LIBC_NAMESPACE::f16sqrtf)
+LIST_NARROWING_SQRT_TESTS(F16sqrtf, float16, float, LIBC_NAMESPACE::f16sqrtf)
diff --git a/libc/test/src/math/smoke/f16sqrtl_test.cpp b/libc/test/src/math/smoke/f16sqrtl_test.cpp
index 4e069bc8dbffd..7e61b9089a3e2 100644
--- a/libc/test/src/math/smoke/f16sqrtl_test.cpp
+++ b/libc/test/src/math/smoke/f16sqrtl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/f16sqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(float16, long double, LIBC_NAMESPACE::f16sqrtl)
+LIST_NARROWING_SQRT_TESTS(F16sqrtl, float16, long double,
+                          LIBC_NAMESPACE::f16sqrtl)
diff --git a/libc/test/src/math/smoke/f16sub_test.cpp b/libc/test/src/math/smoke/f16sub_test.cpp
index 4ab347ba614fb..610816b99545a 100644
--- a/libc/test/src/math/smoke/f16sub_test.cpp
+++ b/libc/test/src/math/smoke/f16sub_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16sub.h"
 
-LIST_SUB_TESTS(float16, double, LIBC_NAMESPACE::f16sub)
+LIST_SUB_TESTS(F16sub, float16, double, LIBC_NAMESPACE::f16sub)
diff --git a/libc/test/src/math/smoke/f16subf128_test.cpp b/libc/test/src/math/smoke/f16subf128_test.cpp
index 4936d89c1f904..a7fbe1c1bd498 100644
--- a/libc/test/src/math/smoke/f16subf128_test.cpp
+++ b/libc/test/src/math/smoke/f16subf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16subf128.h"
 
-LIST_SUB_TESTS(float16, float128, LIBC_NAMESPACE::f16subf128)
+LIST_SUB_TESTS(F16subf128, float16, float128, LIBC_NAMESPACE::f16subf128)
diff --git a/libc/test/src/math/smoke/f16subf_test.cpp b/libc/test/src/math/smoke/f16subf_test.cpp
index 68ad9482ab1e4..0a9e990b17e9a 100644
--- a/libc/test/src/math/smoke/f16subf_test.cpp
+++ b/libc/test/src/math/smoke/f16subf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16subf.h"
 
-LIST_SUB_TESTS(float16, float, LIBC_NAMESPACE::f16subf)
+LIST_SUB_TESTS(F16subf, float16, float, LIBC_NAMESPACE::f16subf)
diff --git a/libc/test/src/math/smoke/f16subl_test.cpp b/libc/test/src/math/smoke/f16subl_test.cpp
index c41e6e97bab09..a19a169c17724 100644
--- a/libc/test/src/math/smoke/f16subl_test.cpp
+++ b/libc/test/src/math/smoke/f16subl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/f16subl.h"
 
-LIST_SUB_TESTS(float16, long double, LIBC_NAMESPACE::f16subl)
+LIST_SUB_TESTS(F16subl, float16, long double, LIBC_NAMESPACE::f16subl)
diff --git a/libc/test/src/math/smoke/fabs_test.cpp b/libc/test/src/math/smoke/fabs_test.cpp
index 0447040ddae30..0925fcb55674f 100644
--- a/libc/test/src/math/smoke/fabs_test.cpp
+++ b/libc/test/src/math/smoke/fabs_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabs.h"
 
-LIST_FABS_TESTS(double, LIBC_NAMESPACE::fabs)
+LIST_FABS_TESTS(Fabs, double, LIBC_NAMESPACE::fabs)
diff --git a/libc/test/src/math/smoke/fabsbf16_test.cpp b/libc/test/src/math/smoke/fabsbf16_test.cpp
index 611050a7775ab..16e11bb891edf 100644
--- a/libc/test/src/math/smoke/fabsbf16_test.cpp
+++ b/libc/test/src/math/smoke/fabsbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fabsbf16.h"
 
-LIST_FABS_TESTS(bfloat16, LIBC_NAMESPACE::fabsbf16)
+LIST_FABS_TESTS(Fabsbf16, bfloat16, LIBC_NAMESPACE::fabsbf16)
diff --git a/libc/test/src/math/smoke/fabsf128_test.cpp b/libc/test/src/math/smoke/fabsf128_test.cpp
index 06bc10a4eb3e2..ba61219e59d91 100644
--- a/libc/test/src/math/smoke/fabsf128_test.cpp
+++ b/libc/test/src/math/smoke/fabsf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FABS_TESTS(float128, LIBC_NAMESPACE::fabsf128)
+LIST_FABS_TESTS(Fabsf128, float128, LIBC_NAMESPACE::fabsf128)
diff --git a/libc/test/src/math/smoke/fabsf16_test.cpp b/libc/test/src/math/smoke/fabsf16_test.cpp
index c43bd5090f90b..8402ce28dd383 100644
--- a/libc/test/src/math/smoke/fabsf16_test.cpp
+++ b/libc/test/src/math/smoke/fabsf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabsf16.h"
 
-LIST_FABS_TESTS(float16, LIBC_NAMESPACE::fabsf16)
+LIST_FABS_TESTS(Fabsf16, float16, LIBC_NAMESPACE::fabsf16)
diff --git a/libc/test/src/math/smoke/fabsf_test.cpp b/libc/test/src/math/smoke/fabsf_test.cpp
index 9f1e2a66d4765..d801ad71e031e 100644
--- a/libc/test/src/math/smoke/fabsf_test.cpp
+++ b/libc/test/src/math/smoke/fabsf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabsf.h"
 
-LIST_FABS_TESTS(float, LIBC_NAMESPACE::fabsf)
+LIST_FABS_TESTS(Fabsf, float, LIBC_NAMESPACE::fabsf)
diff --git a/libc/test/src/math/smoke/fabsl_test.cpp b/libc/test/src/math/smoke/fabsl_test.cpp
index 37d2b54a4c53e..bb671e271211d 100644
--- a/libc/test/src/math/smoke/fabsl_test.cpp
+++ b/libc/test/src/math/smoke/fabsl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fabsl.h"
 
-LIST_FABS_TESTS(long double, LIBC_NAMESPACE::fabsl)
+LIST_FABS_TESTS(Fabsl, long double, LIBC_NAMESPACE::fabsl)
diff --git a/libc/test/src/math/smoke/fadd_test.cpp b/libc/test/src/math/smoke/fadd_test.cpp
index fe9ac8b252ed3..13db60482b192 100644
--- a/libc/test/src/math/smoke/fadd_test.cpp
+++ b/libc/test/src/math/smoke/fadd_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fadd.h"
 
-LIST_ADD_TESTS(float, double, LIBC_NAMESPACE::fadd)
+LIST_ADD_TESTS(Fadd, float, double, LIBC_NAMESPACE::fadd)
diff --git a/libc/test/src/math/smoke/faddf128_test.cpp b/libc/test/src/math/smoke/faddf128_test.cpp
index 5a11b5f419cad..2b8919ea998f4 100644
--- a/libc/test/src/math/smoke/faddf128_test.cpp
+++ b/libc/test/src/math/smoke/faddf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/faddf128.h"
 
-LIST_ADD_TESTS(float, float128, LIBC_NAMESPACE::faddf128)
+LIST_ADD_TESTS(Faddf128, float, float128, LIBC_NAMESPACE::faddf128)
diff --git a/libc/test/src/math/smoke/faddl_test.cpp b/libc/test/src/math/smoke/faddl_test.cpp
index 9c99b32ee7c42..856cd389813fb 100644
--- a/libc/test/src/math/smoke/faddl_test.cpp
+++ b/libc/test/src/math/smoke/faddl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/faddl.h"
 
-LIST_ADD_TESTS(float, long double, LIBC_NAMESPACE::faddl)
+LIST_ADD_TESTS(Faddl, float, long double, LIBC_NAMESPACE::faddl)
diff --git a/libc/test/src/math/smoke/fdim_test.cpp b/libc/test/src/math/smoke/fdim_test.cpp
index e1c150da90af3..796ea784abd8a 100644
--- a/libc/test/src/math/smoke/fdim_test.cpp
+++ b/libc/test/src/math/smoke/fdim_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdim.h"
 
-LIST_FDIM_TESTS(double, LIBC_NAMESPACE::fdim);
+LIST_FDIM_TESTS(Fdim, double, LIBC_NAMESPACE::fdim);
diff --git a/libc/test/src/math/smoke/fdimbf16_test.cpp b/libc/test/src/math/smoke/fdimbf16_test.cpp
index 43e8039053fdf..857b3e48b2122 100644
--- a/libc/test/src/math/smoke/fdimbf16_test.cpp
+++ b/libc/test/src/math/smoke/fdimbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fdimbf16.h"
 
-LIST_FDIM_TESTS(bfloat16, LIBC_NAMESPACE::fdimbf16);
+LIST_FDIM_TESTS(Fdimbf16, bfloat16, LIBC_NAMESPACE::fdimbf16);
diff --git a/libc/test/src/math/smoke/fdimf128_test.cpp b/libc/test/src/math/smoke/fdimf128_test.cpp
index de04c62790fcd..7c971a495d0cf 100644
--- a/libc/test/src/math/smoke/fdimf128_test.cpp
+++ b/libc/test/src/math/smoke/fdimf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FDIM_TESTS(float128, LIBC_NAMESPACE::fdimf128);
+LIST_FDIM_TESTS(Fdimf128, float128, LIBC_NAMESPACE::fdimf128);
diff --git a/libc/test/src/math/smoke/fdimf16_test.cpp b/libc/test/src/math/smoke/fdimf16_test.cpp
index f40fab3713d76..abb1d0634a090 100644
--- a/libc/test/src/math/smoke/fdimf16_test.cpp
+++ b/libc/test/src/math/smoke/fdimf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdimf16.h"
 
-LIST_FDIM_TESTS(float16, LIBC_NAMESPACE::fdimf16);
+LIST_FDIM_TESTS(Fdimf16, float16, LIBC_NAMESPACE::fdimf16);
diff --git a/libc/test/src/math/smoke/fdimf_test.cpp b/libc/test/src/math/smoke/fdimf_test.cpp
index 9c27c1d2fc202..a7810b940400e 100644
--- a/libc/test/src/math/smoke/fdimf_test.cpp
+++ b/libc/test/src/math/smoke/fdimf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdimf.h"
 
-LIST_FDIM_TESTS(float, LIBC_NAMESPACE::fdimf);
+LIST_FDIM_TESTS(Fdimf, float, LIBC_NAMESPACE::fdimf);
diff --git a/libc/test/src/math/smoke/fdiml_test.cpp b/libc/test/src/math/smoke/fdiml_test.cpp
index ed448a612ec76..272da3383a88f 100644
--- a/libc/test/src/math/smoke/fdiml_test.cpp
+++ b/libc/test/src/math/smoke/fdiml_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdiml.h"
 
-LIST_FDIM_TESTS(long double, LIBC_NAMESPACE::fdiml);
+LIST_FDIM_TESTS(Fdiml, long double, LIBC_NAMESPACE::fdiml);
diff --git a/libc/test/src/math/smoke/fdiv_test.cpp b/libc/test/src/math/smoke/fdiv_test.cpp
index f0bd602003b28..d53af73a41ab2 100644
--- a/libc/test/src/math/smoke/fdiv_test.cpp
+++ b/libc/test/src/math/smoke/fdiv_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdiv.h"
 
-LIST_DIV_TESTS(float, double, LIBC_NAMESPACE::fdiv)
+LIST_DIV_TESTS(Fdiv, float, double, LIBC_NAMESPACE::fdiv)
diff --git a/libc/test/src/math/smoke/fdivf128_test.cpp b/libc/test/src/math/smoke/fdivf128_test.cpp
index a687e079b597e..7b95a29e1c8fc 100644
--- a/libc/test/src/math/smoke/fdivf128_test.cpp
+++ b/libc/test/src/math/smoke/fdivf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdivf128.h"
 
-LIST_DIV_TESTS(float, float128, LIBC_NAMESPACE::fdivf128)
+LIST_DIV_TESTS(Fdivf128, float, float128, LIBC_NAMESPACE::fdivf128)
diff --git a/libc/test/src/math/smoke/fdivl_test.cpp b/libc/test/src/math/smoke/fdivl_test.cpp
index bc2b0e4d9f060..2b9caa85dcb27 100644
--- a/libc/test/src/math/smoke/fdivl_test.cpp
+++ b/libc/test/src/math/smoke/fdivl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fdivl.h"
 
-LIST_DIV_TESTS(float, long double, LIBC_NAMESPACE::fdivl)
+LIST_DIV_TESTS(Fdivl, float, long double, LIBC_NAMESPACE::fdivl)
diff --git a/libc/test/src/math/smoke/ffma_test.cpp b/libc/test/src/math/smoke/ffma_test.cpp
index 4b6a25c50d15c..a24525d57cd5f 100644
--- a/libc/test/src/math/smoke/ffma_test.cpp
+++ b/libc/test/src/math/smoke/ffma_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ffma.h"
 
-LIST_NARROWING_FMA_TESTS(float, double, LIBC_NAMESPACE::ffma)
+LIST_NARROWING_FMA_TESTS(Ffma, float, double, LIBC_NAMESPACE::ffma)
diff --git a/libc/test/src/math/smoke/ffmaf128_test.cpp b/libc/test/src/math/smoke/ffmaf128_test.cpp
index a8f81e253df2f..82e8203e988fc 100644
--- a/libc/test/src/math/smoke/ffmaf128_test.cpp
+++ b/libc/test/src/math/smoke/ffmaf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ffmaf128.h"
 
-LIST_NARROWING_FMA_TESTS(float, float128, LIBC_NAMESPACE::ffmaf128)
+LIST_NARROWING_FMA_TESTS(Ffmaf128, float, float128, LIBC_NAMESPACE::ffmaf128)
diff --git a/libc/test/src/math/smoke/ffmal_test.cpp b/libc/test/src/math/smoke/ffmal_test.cpp
index 200d9e16839d0..a699042943f05 100644
--- a/libc/test/src/math/smoke/ffmal_test.cpp
+++ b/libc/test/src/math/smoke/ffmal_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ffmal.h"
 
-LIST_NARROWING_FMA_TESTS(float, long double, LIBC_NAMESPACE::ffmal)
+LIST_NARROWING_FMA_TESTS(Ffmal, float, long double, LIBC_NAMESPACE::ffmal)
diff --git a/libc/test/src/math/smoke/floor_test.cpp b/libc/test/src/math/smoke/floor_test.cpp
index 9231d07aeb7f8..d92cf18703075 100644
--- a/libc/test/src/math/smoke/floor_test.cpp
+++ b/libc/test/src/math/smoke/floor_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floor.h"
 
-LIST_FLOOR_TESTS(double, LIBC_NAMESPACE::floor)
+LIST_FLOOR_TESTS(Floor, double, LIBC_NAMESPACE::floor)
diff --git a/libc/test/src/math/smoke/floorbf16_test.cpp b/libc/test/src/math/smoke/floorbf16_test.cpp
index 9cc77cd15aa1c..3afe1a5d98085 100644
--- a/libc/test/src/math/smoke/floorbf16_test.cpp
+++ b/libc/test/src/math/smoke/floorbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/floorbf16.h"
 
-LIST_FLOOR_TESTS(bfloat16, LIBC_NAMESPACE::floorbf16)
+LIST_FLOOR_TESTS(Floorbf16, bfloat16, LIBC_NAMESPACE::floorbf16)
diff --git a/libc/test/src/math/smoke/floorf128_test.cpp b/libc/test/src/math/smoke/floorf128_test.cpp
index bc9e4db891c46..938634d0b8a76 100644
--- a/libc/test/src/math/smoke/floorf128_test.cpp
+++ b/libc/test/src/math/smoke/floorf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FLOOR_TESTS(float128, LIBC_NAMESPACE::floorf128)
+LIST_FLOOR_TESTS(Floorf128, float128, LIBC_NAMESPACE::floorf128)
diff --git a/libc/test/src/math/smoke/floorf16_test.cpp b/libc/test/src/math/smoke/floorf16_test.cpp
index ca5160e927035..bdfa26ec99b49 100644
--- a/libc/test/src/math/smoke/floorf16_test.cpp
+++ b/libc/test/src/math/smoke/floorf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorf16.h"
 
-LIST_FLOOR_TESTS(float16, LIBC_NAMESPACE::floorf16)
+LIST_FLOOR_TESTS(Floorf16, float16, LIBC_NAMESPACE::floorf16)
diff --git a/libc/test/src/math/smoke/floorf_test.cpp b/libc/test/src/math/smoke/floorf_test.cpp
index cbb11f36f58da..155e7430bee1c 100644
--- a/libc/test/src/math/smoke/floorf_test.cpp
+++ b/libc/test/src/math/smoke/floorf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorf.h"
 
-LIST_FLOOR_TESTS(float, LIBC_NAMESPACE::floorf)
+LIST_FLOOR_TESTS(Floorf, float, LIBC_NAMESPACE::floorf)
diff --git a/libc/test/src/math/smoke/floorl_test.cpp b/libc/test/src/math/smoke/floorl_test.cpp
index 26f6a7703ed0f..4ef604b413d0c 100644
--- a/libc/test/src/math/smoke/floorl_test.cpp
+++ b/libc/test/src/math/smoke/floorl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/floorl.h"
 
-LIST_FLOOR_TESTS(long double, LIBC_NAMESPACE::floorl)
+LIST_FLOOR_TESTS(Floorl, long double, LIBC_NAMESPACE::floorl)
diff --git a/libc/test/src/math/smoke/fma_test.cpp b/libc/test/src/math/smoke/fma_test.cpp
index c5d802a532eb0..e9a4b32d8b679 100644
--- a/libc/test/src/math/smoke/fma_test.cpp
+++ b/libc/test/src/math/smoke/fma_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fma.h"
 
-LIST_FMA_TESTS(double, LIBC_NAMESPACE::fma)
+LIST_FMA_TESTS(Fma, double, LIBC_NAMESPACE::fma)
diff --git a/libc/test/src/math/smoke/fmabf16_test.cpp b/libc/test/src/math/smoke/fmabf16_test.cpp
index 4b1ececf40d74..baf1ddaa0ecc9 100644
--- a/libc/test/src/math/smoke/fmabf16_test.cpp
+++ b/libc/test/src/math/smoke/fmabf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmabf16.h"
 
-LIST_FMA_TESTS(bfloat16, LIBC_NAMESPACE::fmabf16)
+LIST_FMA_TESTS(Fmabf16, bfloat16, LIBC_NAMESPACE::fmabf16)
diff --git a/libc/test/src/math/smoke/fmaf16_test.cpp b/libc/test/src/math/smoke/fmaf16_test.cpp
index 233d3a7c54cf4..a6923a91dc330 100644
--- a/libc/test/src/math/smoke/fmaf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaf16.h"
 
-LIST_FMA_TESTS(float16, LIBC_NAMESPACE::fmaf16)
+LIST_FMA_TESTS(Fmaf16, float16, LIBC_NAMESPACE::fmaf16)
diff --git a/libc/test/src/math/smoke/fmaf_test.cpp b/libc/test/src/math/smoke/fmaf_test.cpp
index 09e9c504b942a..ae62bdb8192f1 100644
--- a/libc/test/src/math/smoke/fmaf_test.cpp
+++ b/libc/test/src/math/smoke/fmaf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaf.h"
 
-LIST_FMA_TESTS(float, LIBC_NAMESPACE::fmaf)
+LIST_FMA_TESTS(Fmaf, float, LIBC_NAMESPACE::fmaf)
diff --git a/libc/test/src/math/smoke/fmax_test.cpp b/libc/test/src/math/smoke/fmax_test.cpp
index 6800939625ebc..deb3516e85d86 100644
--- a/libc/test/src/math/smoke/fmax_test.cpp
+++ b/libc/test/src/math/smoke/fmax_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmax.h"
 
-LIST_FMAX_TESTS(double, LIBC_NAMESPACE::fmax)
+LIST_FMAX_TESTS(Fmax, double, LIBC_NAMESPACE::fmax)
diff --git a/libc/test/src/math/smoke/fmaxbf16_test.cpp b/libc/test/src/math/smoke/fmaxbf16_test.cpp
index 8ff9313a1994b..0ef1d796b99d5 100644
--- a/libc/test/src/math/smoke/fmaxbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaxbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmaxbf16.h"
 
-LIST_FMAX_TESTS(bfloat16, LIBC_NAMESPACE::fmaxbf16)
+LIST_FMAX_TESTS(Fmaxbf16, bfloat16, LIBC_NAMESPACE::fmaxbf16)
diff --git a/libc/test/src/math/smoke/fmaxf128_test.cpp b/libc/test/src/math/smoke/fmaxf128_test.cpp
index 316e15082e2af..f1a5a76c9b92b 100644
--- a/libc/test/src/math/smoke/fmaxf128_test.cpp
+++ b/libc/test/src/math/smoke/fmaxf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMAX_TESTS(float128, LIBC_NAMESPACE::fmaxf128)
+LIST_FMAX_TESTS(Fmaxf128, float128, LIBC_NAMESPACE::fmaxf128)
diff --git a/libc/test/src/math/smoke/fmaxf16_test.cpp b/libc/test/src/math/smoke/fmaxf16_test.cpp
index 79c03b7685b06..f9acc27a7956a 100644
--- a/libc/test/src/math/smoke/fmaxf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaxf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaxf16.h"
 
-LIST_FMAX_TESTS(float16, LIBC_NAMESPACE::fmaxf16)
+LIST_FMAX_TESTS(Fmaxf16, float16, LIBC_NAMESPACE::fmaxf16)
diff --git a/libc/test/src/math/smoke/fmaxf_test.cpp b/libc/test/src/math/smoke/fmaxf_test.cpp
index 25c6f7339e8c9..b6a359c3e7f95 100644
--- a/libc/test/src/math/smoke/fmaxf_test.cpp
+++ b/libc/test/src/math/smoke/fmaxf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaxf.h"
 
-LIST_FMAX_TESTS(float, LIBC_NAMESPACE::fmaxf)
+LIST_FMAX_TESTS(Fmaxf, float, LIBC_NAMESPACE::fmaxf)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_num_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_num_test.cpp
index 16ec1b0ea3437..43c8947571db4 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_num_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_num_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_mag_num.h"
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(double, LIBC_NAMESPACE::fmaximum_mag_num)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNum, double,
+                            LIBC_NAMESPACE::fmaximum_mag_num)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_numbf16_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_numbf16_test.cpp
index 9e435cc365080..a6a9efad4704c 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_numbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_numbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmaximum_mag_numbf16.h"
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(bfloat16, LIBC_NAMESPACE::fmaximum_mag_numbf16)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNumbf16, bfloat16,
+                            LIBC_NAMESPACE::fmaximum_mag_numbf16)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_numf128_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_numf128_test.cpp
index c5bf939aeae5c..28144e1a89537 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_numf128_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_numf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(float128, LIBC_NAMESPACE::fmaximum_mag_numf128)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNumf128, float128,
+                            LIBC_NAMESPACE::fmaximum_mag_numf128)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_numf16_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_numf16_test.cpp
index b11653eb395e2..7fe24210abb53 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_numf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_numf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_mag_numf16.h"
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(float16, LIBC_NAMESPACE::fmaximum_mag_numf16)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNumf16, float16,
+                            LIBC_NAMESPACE::fmaximum_mag_numf16)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_numf_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_numf_test.cpp
index a8a46f96970ed..503caa10faf31 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_numf_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_numf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_mag_numf.h"
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(float, LIBC_NAMESPACE::fmaximum_mag_numf)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNumf, float,
+                            LIBC_NAMESPACE::fmaximum_mag_numf)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_numl_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_numl_test.cpp
index c03fa20bd367e..23758774684cc 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_numl_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_numl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_mag_numl.h"
 
-LIST_FMAXIMUM_MAG_NUM_TESTS(long double, LIBC_NAMESPACE::fmaximum_mag_numl)
+LIST_FMAXIMUM_MAG_NUM_TESTS(FmaximumMagNuml, long double,
+                            LIBC_NAMESPACE::fmaximum_mag_numl)
diff --git a/libc/test/src/math/smoke/fmaximum_mag_test.cpp b/libc/test/src/math/smoke/fmaximum_mag_test.cpp
index e70602f044ec6..5e7e0f21c51b7 100644
--- a/libc/test/src/math/smoke/fmaximum_mag_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_mag_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximum_mag.h"
 
-LIST_FMAXIMUM_MAG_TESTS(double, LIBC_NAMESPACE::fmaximum_mag)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMag, double, LIBC_NAMESPACE::fmaximum_mag)
diff --git a/libc/test/src/math/smoke/fmaximum_magbf16_test.cpp b/libc/test/src/math/smoke/fmaximum_magbf16_test.cpp
index 22a0bc3380983..810519296482a 100644
--- a/libc/test/src/math/smoke/fmaximum_magbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_magbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmaximum_magbf16.h"
 
-LIST_FMAXIMUM_MAG_TESTS(bfloat16, LIBC_NAMESPACE::fmaximum_magbf16)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMagbf16, bfloat16,
+                        LIBC_NAMESPACE::fmaximum_magbf16)
diff --git a/libc/test/src/math/smoke/fmaximum_magf128_test.cpp b/libc/test/src/math/smoke/fmaximum_magf128_test.cpp
index 1701ffc9fac22..72c37cc842fb5 100644
--- a/libc/test/src/math/smoke/fmaximum_magf128_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_magf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMAXIMUM_MAG_TESTS(float128, LIBC_NAMESPACE::fmaximum_magf128)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMagf128, float128,
+                        LIBC_NAMESPACE::fmaximum_magf128)
diff --git a/libc/test/src/math/smoke/fmaximum_magf16_test.cpp b/libc/test/src/math/smoke/fmaximum_magf16_test.cpp
index 6df1e4aaf6a96..48612510a3636 100644
--- a/libc/test/src/math/smoke/fmaximum_magf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_magf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_magf16.h"
 
-LIST_FMAXIMUM_MAG_TESTS(float16, LIBC_NAMESPACE::fmaximum_magf16)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMagf16, float16,
+                        LIBC_NAMESPACE::fmaximum_magf16)
diff --git a/libc/test/src/math/smoke/fmaximum_magf_test.cpp b/libc/test/src/math/smoke/fmaximum_magf_test.cpp
index efca320b2b373..710b77e705b5a 100644
--- a/libc/test/src/math/smoke/fmaximum_magf_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_magf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximum_magf.h"
 
-LIST_FMAXIMUM_MAG_TESTS(float, LIBC_NAMESPACE::fmaximum_magf)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMagf, float, LIBC_NAMESPACE::fmaximum_magf)
diff --git a/libc/test/src/math/smoke/fmaximum_magl_test.cpp b/libc/test/src/math/smoke/fmaximum_magl_test.cpp
index 16b420b8714b0..7054cde7c446e 100644
--- a/libc/test/src/math/smoke/fmaximum_magl_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_magl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_magl.h"
 
-LIST_FMAXIMUM_MAG_TESTS(long double, LIBC_NAMESPACE::fmaximum_magl)
+LIST_FMAXIMUM_MAG_TESTS(FmaximumMagl, long double,
+                        LIBC_NAMESPACE::fmaximum_magl)
diff --git a/libc/test/src/math/smoke/fmaximum_num_test.cpp b/libc/test/src/math/smoke/fmaximum_num_test.cpp
index cb9afdf78b83f..5ad0988debc31 100644
--- a/libc/test/src/math/smoke/fmaximum_num_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_num_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximum_num.h"
 
-LIST_FMAXIMUM_NUM_TESTS(double, LIBC_NAMESPACE::fmaximum_num)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNum, double, LIBC_NAMESPACE::fmaximum_num)
diff --git a/libc/test/src/math/smoke/fmaximum_numbf16_test.cpp b/libc/test/src/math/smoke/fmaximum_numbf16_test.cpp
index 25dbe9f54603e..1164718c6e96d 100644
--- a/libc/test/src/math/smoke/fmaximum_numbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_numbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmaximum_numbf16.h"
 
-LIST_FMAXIMUM_NUM_TESTS(bfloat16, LIBC_NAMESPACE::fmaximum_numbf16)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNumbf16, bfloat16,
+                        LIBC_NAMESPACE::fmaximum_numbf16)
diff --git a/libc/test/src/math/smoke/fmaximum_numf128_test.cpp b/libc/test/src/math/smoke/fmaximum_numf128_test.cpp
index 2e870609b3fee..3826eeda64f4c 100644
--- a/libc/test/src/math/smoke/fmaximum_numf128_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_numf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMAXIMUM_NUM_TESTS(float128, LIBC_NAMESPACE::fmaximum_numf128)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNumf128, float128,
+                        LIBC_NAMESPACE::fmaximum_numf128)
diff --git a/libc/test/src/math/smoke/fmaximum_numf16_test.cpp b/libc/test/src/math/smoke/fmaximum_numf16_test.cpp
index 7cb9cb068cf7f..3e853e8fcc6cc 100644
--- a/libc/test/src/math/smoke/fmaximum_numf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_numf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_numf16.h"
 
-LIST_FMAXIMUM_NUM_TESTS(float16, LIBC_NAMESPACE::fmaximum_numf16)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNumf16, float16,
+                        LIBC_NAMESPACE::fmaximum_numf16)
diff --git a/libc/test/src/math/smoke/fmaximum_numf_test.cpp b/libc/test/src/math/smoke/fmaximum_numf_test.cpp
index 053d18803e07f..2d968c7897361 100644
--- a/libc/test/src/math/smoke/fmaximum_numf_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_numf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximum_numf.h"
 
-LIST_FMAXIMUM_NUM_TESTS(float, LIBC_NAMESPACE::fmaximum_numf)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNumf, float, LIBC_NAMESPACE::fmaximum_numf)
diff --git a/libc/test/src/math/smoke/fmaximum_numl_test.cpp b/libc/test/src/math/smoke/fmaximum_numl_test.cpp
index bf9612c4111da..4eb939a06e2d3 100644
--- a/libc/test/src/math/smoke/fmaximum_numl_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_numl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fmaximum_numl.h"
 
-LIST_FMAXIMUM_NUM_TESTS(long double, LIBC_NAMESPACE::fmaximum_numl)
+LIST_FMAXIMUM_NUM_TESTS(FmaximumNuml, long double,
+                        LIBC_NAMESPACE::fmaximum_numl)
diff --git a/libc/test/src/math/smoke/fmaximum_test.cpp b/libc/test/src/math/smoke/fmaximum_test.cpp
index 990e0177d8689..4e1c40978f20f 100644
--- a/libc/test/src/math/smoke/fmaximum_test.cpp
+++ b/libc/test/src/math/smoke/fmaximum_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximum.h"
 
-LIST_FMAXIMUM_TESTS(double, LIBC_NAMESPACE::fmaximum)
+LIST_FMAXIMUM_TESTS(Fmaximum, double, LIBC_NAMESPACE::fmaximum)
diff --git a/libc/test/src/math/smoke/fmaximumbf16_test.cpp b/libc/test/src/math/smoke/fmaximumbf16_test.cpp
index e2cf56bcea64a..96036def5a881 100644
--- a/libc/test/src/math/smoke/fmaximumbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximumbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmaximumbf16.h"
 
-LIST_FMAXIMUM_TESTS(bfloat16, LIBC_NAMESPACE::fmaximumbf16)
+LIST_FMAXIMUM_TESTS(Fmaximumbf16, bfloat16, LIBC_NAMESPACE::fmaximumbf16)
diff --git a/libc/test/src/math/smoke/fmaximumf128_test.cpp b/libc/test/src/math/smoke/fmaximumf128_test.cpp
index 6ecc1f012adc2..1ae4d210e3395 100644
--- a/libc/test/src/math/smoke/fmaximumf128_test.cpp
+++ b/libc/test/src/math/smoke/fmaximumf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMAXIMUM_TESTS(float128, LIBC_NAMESPACE::fmaximumf128)
+LIST_FMAXIMUM_TESTS(Fmaximumf128, float128, LIBC_NAMESPACE::fmaximumf128)
diff --git a/libc/test/src/math/smoke/fmaximumf16_test.cpp b/libc/test/src/math/smoke/fmaximumf16_test.cpp
index 4cbf846a1610f..25fead0051b37 100644
--- a/libc/test/src/math/smoke/fmaximumf16_test.cpp
+++ b/libc/test/src/math/smoke/fmaximumf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximumf16.h"
 
-LIST_FMAXIMUM_TESTS(float16, LIBC_NAMESPACE::fmaximumf16)
+LIST_FMAXIMUM_TESTS(Fmaximumf16, float16, LIBC_NAMESPACE::fmaximumf16)
diff --git a/libc/test/src/math/smoke/fmaximumf_test.cpp b/libc/test/src/math/smoke/fmaximumf_test.cpp
index a92bbd1446e71..0fe810cd094ae 100644
--- a/libc/test/src/math/smoke/fmaximumf_test.cpp
+++ b/libc/test/src/math/smoke/fmaximumf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximumf.h"
 
-LIST_FMAXIMUM_TESTS(float, LIBC_NAMESPACE::fmaximumf)
+LIST_FMAXIMUM_TESTS(Fmaximumf, float, LIBC_NAMESPACE::fmaximumf)
diff --git a/libc/test/src/math/smoke/fmaximuml_test.cpp b/libc/test/src/math/smoke/fmaximuml_test.cpp
index 080847b9f4de8..a160cec3ae54d 100644
--- a/libc/test/src/math/smoke/fmaximuml_test.cpp
+++ b/libc/test/src/math/smoke/fmaximuml_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaximuml.h"
 
-LIST_FMAXIMUM_TESTS(long double, LIBC_NAMESPACE::fmaximuml)
+LIST_FMAXIMUM_TESTS(Fmaximuml, long double, LIBC_NAMESPACE::fmaximuml)
diff --git a/libc/test/src/math/smoke/fmaxl_test.cpp b/libc/test/src/math/smoke/fmaxl_test.cpp
index 9ac986c00012a..43ba72817dfb5 100644
--- a/libc/test/src/math/smoke/fmaxl_test.cpp
+++ b/libc/test/src/math/smoke/fmaxl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmaxl.h"
 
-LIST_FMAX_TESTS(long double, LIBC_NAMESPACE::fmaxl)
+LIST_FMAX_TESTS(Fmaxl, long double, LIBC_NAMESPACE::fmaxl)
diff --git a/libc/test/src/math/smoke/fmin_test.cpp b/libc/test/src/math/smoke/fmin_test.cpp
index 5d241519021d4..02611cabffbb5 100644
--- a/libc/test/src/math/smoke/fmin_test.cpp
+++ b/libc/test/src/math/smoke/fmin_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmin.h"
 
-LIST_FMIN_TESTS(double, LIBC_NAMESPACE::fmin)
+LIST_FMIN_TESTS(Fmin, double, LIBC_NAMESPACE::fmin)
diff --git a/libc/test/src/math/smoke/fminbf16_test.cpp b/libc/test/src/math/smoke/fminbf16_test.cpp
index 195a0ac07c8ff..70b2d9d2a5dce 100644
--- a/libc/test/src/math/smoke/fminbf16_test.cpp
+++ b/libc/test/src/math/smoke/fminbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fminbf16.h"
 
-LIST_FMIN_TESTS(bfloat16, LIBC_NAMESPACE::fminbf16)
+LIST_FMIN_TESTS(Fminbf16, bfloat16, LIBC_NAMESPACE::fminbf16)
diff --git a/libc/test/src/math/smoke/fminf128_test.cpp b/libc/test/src/math/smoke/fminf128_test.cpp
index 363ee76f53994..02fc13083a77e 100644
--- a/libc/test/src/math/smoke/fminf128_test.cpp
+++ b/libc/test/src/math/smoke/fminf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMIN_TESTS(float128, LIBC_NAMESPACE::fminf128)
+LIST_FMIN_TESTS(Fminf128, float128, LIBC_NAMESPACE::fminf128)
diff --git a/libc/test/src/math/smoke/fminf16_test.cpp b/libc/test/src/math/smoke/fminf16_test.cpp
index 4379a6e750653..0650d9d59f1d8 100644
--- a/libc/test/src/math/smoke/fminf16_test.cpp
+++ b/libc/test/src/math/smoke/fminf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminf16.h"
 
-LIST_FMIN_TESTS(float16, LIBC_NAMESPACE::fminf16)
+LIST_FMIN_TESTS(Fminf16, float16, LIBC_NAMESPACE::fminf16)
diff --git a/libc/test/src/math/smoke/fminf_test.cpp b/libc/test/src/math/smoke/fminf_test.cpp
index 1af5b79155b1d..7d03026137fcf 100644
--- a/libc/test/src/math/smoke/fminf_test.cpp
+++ b/libc/test/src/math/smoke/fminf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminf.h"
 
-LIST_FMIN_TESTS(float, LIBC_NAMESPACE::fminf)
+LIST_FMIN_TESTS(Fminf, float, LIBC_NAMESPACE::fminf)
diff --git a/libc/test/src/math/smoke/fminimum_mag_num_test.cpp b/libc/test/src/math/smoke/fminimum_mag_num_test.cpp
index 471f2ceb3c2cd..d556aae0195e6 100644
--- a/libc/test/src/math/smoke/fminimum_mag_num_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_num_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_mag_num.h"
 
-LIST_FMINIMUM_MAG_NUM_TESTS(double, LIBC_NAMESPACE::fminimum_mag_num)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNum, double,
+                            LIBC_NAMESPACE::fminimum_mag_num)
diff --git a/libc/test/src/math/smoke/fminimum_mag_numbf16_test.cpp b/libc/test/src/math/smoke/fminimum_mag_numbf16_test.cpp
index ed3d4474a743d..edcf4fb63d5c4 100644
--- a/libc/test/src/math/smoke/fminimum_mag_numbf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_numbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fminimum_mag_numbf16.h"
 
-LIST_FMINIMUM_MAG_NUM_TESTS(bfloat16, LIBC_NAMESPACE::fminimum_mag_numbf16)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNumbf16, bfloat16,
+                            LIBC_NAMESPACE::fminimum_mag_numbf16)
diff --git a/libc/test/src/math/smoke/fminimum_mag_numf128_test.cpp b/libc/test/src/math/smoke/fminimum_mag_numf128_test.cpp
index 7278abcca5280..034b0ec44adda 100644
--- a/libc/test/src/math/smoke/fminimum_mag_numf128_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_numf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMINIMUM_MAG_NUM_TESTS(float128, LIBC_NAMESPACE::fminimum_mag_numf128)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNumf128, float128,
+                            LIBC_NAMESPACE::fminimum_mag_numf128)
diff --git a/libc/test/src/math/smoke/fminimum_mag_numf16_test.cpp b/libc/test/src/math/smoke/fminimum_mag_numf16_test.cpp
index 2c6aede529cd4..b7541e6e8aacf 100644
--- a/libc/test/src/math/smoke/fminimum_mag_numf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_numf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_mag_numf16.h"
 
-LIST_FMINIMUM_MAG_NUM_TESTS(float16, LIBC_NAMESPACE::fminimum_mag_numf16)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNumf16, float16,
+                            LIBC_NAMESPACE::fminimum_mag_numf16)
diff --git a/libc/test/src/math/smoke/fminimum_mag_numf_test.cpp b/libc/test/src/math/smoke/fminimum_mag_numf_test.cpp
index 773ba806b99ec..741663c8dc8e0 100644
--- a/libc/test/src/math/smoke/fminimum_mag_numf_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_numf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_mag_numf.h"
 
-LIST_FMINIMUM_MAG_NUM_TESTS(float, LIBC_NAMESPACE::fminimum_mag_numf)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNumf, float,
+                            LIBC_NAMESPACE::fminimum_mag_numf)
diff --git a/libc/test/src/math/smoke/fminimum_mag_numl_test.cpp b/libc/test/src/math/smoke/fminimum_mag_numl_test.cpp
index b4152779db730..6ea4d64ba4050 100644
--- a/libc/test/src/math/smoke/fminimum_mag_numl_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_numl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_mag_numl.h"
 
-LIST_FMINIMUM_MAG_NUM_TESTS(long double, LIBC_NAMESPACE::fminimum_mag_numl)
+LIST_FMINIMUM_MAG_NUM_TESTS(FminimumMagNuml, long double,
+                            LIBC_NAMESPACE::fminimum_mag_numl)
diff --git a/libc/test/src/math/smoke/fminimum_mag_test.cpp b/libc/test/src/math/smoke/fminimum_mag_test.cpp
index f4138f3353d11..134806c97f0f8 100644
--- a/libc/test/src/math/smoke/fminimum_mag_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_mag_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimum_mag.h"
 
-LIST_FMINIMUM_MAG_TESTS(double, LIBC_NAMESPACE::fminimum_mag)
+LIST_FMINIMUM_MAG_TESTS(FminimumMag, double, LIBC_NAMESPACE::fminimum_mag)
diff --git a/libc/test/src/math/smoke/fminimum_magbf16_test.cpp b/libc/test/src/math/smoke/fminimum_magbf16_test.cpp
index 94251e0f94501..9da7bcbb6b7bd 100644
--- a/libc/test/src/math/smoke/fminimum_magbf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_magbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fminimum_magbf16.h"
 
-LIST_FMINIMUM_MAG_TESTS(bfloat16, LIBC_NAMESPACE::fminimum_magbf16)
+LIST_FMINIMUM_MAG_TESTS(FminimumMagbf16, bfloat16,
+                        LIBC_NAMESPACE::fminimum_magbf16)
diff --git a/libc/test/src/math/smoke/fminimum_magf128_test.cpp b/libc/test/src/math/smoke/fminimum_magf128_test.cpp
index 75f40faa2bfab..a62afc5dbaac2 100644
--- a/libc/test/src/math/smoke/fminimum_magf128_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_magf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMINIMUM_MAG_TESTS(float128, LIBC_NAMESPACE::fminimum_magf128)
+LIST_FMINIMUM_MAG_TESTS(FminimumMagf128, float128,
+                        LIBC_NAMESPACE::fminimum_magf128)
diff --git a/libc/test/src/math/smoke/fminimum_magf16_test.cpp b/libc/test/src/math/smoke/fminimum_magf16_test.cpp
index 3687aecedfd9f..7803d8fc8740a 100644
--- a/libc/test/src/math/smoke/fminimum_magf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_magf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_magf16.h"
 
-LIST_FMINIMUM_MAG_TESTS(float16, LIBC_NAMESPACE::fminimum_magf16)
+LIST_FMINIMUM_MAG_TESTS(FminimumMagf16, float16,
+                        LIBC_NAMESPACE::fminimum_magf16)
diff --git a/libc/test/src/math/smoke/fminimum_magf_test.cpp b/libc/test/src/math/smoke/fminimum_magf_test.cpp
index aa27431489309..ca313897a7cc3 100644
--- a/libc/test/src/math/smoke/fminimum_magf_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_magf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimum_magf.h"
 
-LIST_FMINIMUM_MAG_TESTS(float, LIBC_NAMESPACE::fminimum_magf)
+LIST_FMINIMUM_MAG_TESTS(FminimumMagf, float, LIBC_NAMESPACE::fminimum_magf)
diff --git a/libc/test/src/math/smoke/fminimum_magl_test.cpp b/libc/test/src/math/smoke/fminimum_magl_test.cpp
index c6fbf7df0e70a..8bf7a04c77caa 100644
--- a/libc/test/src/math/smoke/fminimum_magl_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_magl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_magl.h"
 
-LIST_FMINIMUM_MAG_TESTS(long double, LIBC_NAMESPACE::fminimum_magl)
+LIST_FMINIMUM_MAG_TESTS(FminimumMagl, long double,
+                        LIBC_NAMESPACE::fminimum_magl)
diff --git a/libc/test/src/math/smoke/fminimum_num_test.cpp b/libc/test/src/math/smoke/fminimum_num_test.cpp
index 1be7ebb5fe8e9..1f19fb7448a69 100644
--- a/libc/test/src/math/smoke/fminimum_num_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_num_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimum_num.h"
 
-LIST_FMINIMUM_NUM_TESTS(double, LIBC_NAMESPACE::fminimum_num)
+LIST_FMINIMUM_NUM_TESTS(FminimumNum, double, LIBC_NAMESPACE::fminimum_num)
diff --git a/libc/test/src/math/smoke/fminimum_numbf16_test.cpp b/libc/test/src/math/smoke/fminimum_numbf16_test.cpp
index fe8bb51ffc67f..faf8af52ae795 100644
--- a/libc/test/src/math/smoke/fminimum_numbf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_numbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fminimum_numbf16.h"
 
-LIST_FMINIMUM_NUM_TESTS(bfloat16, LIBC_NAMESPACE::fminimum_numbf16)
+LIST_FMINIMUM_NUM_TESTS(FminimumNumbf16, bfloat16,
+                        LIBC_NAMESPACE::fminimum_numbf16)
diff --git a/libc/test/src/math/smoke/fminimum_numf128_test.cpp b/libc/test/src/math/smoke/fminimum_numf128_test.cpp
index cc954e817daee..367898a352e9e 100644
--- a/libc/test/src/math/smoke/fminimum_numf128_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_numf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMINIMUM_NUM_TESTS(float128, LIBC_NAMESPACE::fminimum_numf128)
+LIST_FMINIMUM_NUM_TESTS(FminimumNumf128, float128,
+                        LIBC_NAMESPACE::fminimum_numf128)
diff --git a/libc/test/src/math/smoke/fminimum_numf16_test.cpp b/libc/test/src/math/smoke/fminimum_numf16_test.cpp
index 67750816d229c..c654ce6257c0f 100644
--- a/libc/test/src/math/smoke/fminimum_numf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_numf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_numf16.h"
 
-LIST_FMINIMUM_NUM_TESTS(float16, LIBC_NAMESPACE::fminimum_numf16)
+LIST_FMINIMUM_NUM_TESTS(FminimumNumf16, float16,
+                        LIBC_NAMESPACE::fminimum_numf16)
diff --git a/libc/test/src/math/smoke/fminimum_numf_test.cpp b/libc/test/src/math/smoke/fminimum_numf_test.cpp
index 9b60f39d55a8d..6f221ab5cd310 100644
--- a/libc/test/src/math/smoke/fminimum_numf_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_numf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimum_numf.h"
 
-LIST_FMINIMUM_NUM_TESTS(float, LIBC_NAMESPACE::fminimum_numf)
+LIST_FMINIMUM_NUM_TESTS(FminimumNumf, float, LIBC_NAMESPACE::fminimum_numf)
diff --git a/libc/test/src/math/smoke/fminimum_numl_test.cpp b/libc/test/src/math/smoke/fminimum_numl_test.cpp
index 8a72cd8adc5bf..2d8d3dcdc7f66 100644
--- a/libc/test/src/math/smoke/fminimum_numl_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_numl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/fminimum_numl.h"
 
-LIST_FMINIMUM_NUM_TESTS(long double, LIBC_NAMESPACE::fminimum_numl)
+LIST_FMINIMUM_NUM_TESTS(FminimumNuml, long double,
+                        LIBC_NAMESPACE::fminimum_numl)
diff --git a/libc/test/src/math/smoke/fminimum_test.cpp b/libc/test/src/math/smoke/fminimum_test.cpp
index 7778f1c2311c0..aa142f031a23a 100644
--- a/libc/test/src/math/smoke/fminimum_test.cpp
+++ b/libc/test/src/math/smoke/fminimum_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimum.h"
 
-LIST_FMINIMUM_TESTS(double, LIBC_NAMESPACE::fminimum)
+LIST_FMINIMUM_TESTS(Fminimum, double, LIBC_NAMESPACE::fminimum)
diff --git a/libc/test/src/math/smoke/fminimumbf16_test.cpp b/libc/test/src/math/smoke/fminimumbf16_test.cpp
index 3667e90745cbb..1b93cd136973c 100644
--- a/libc/test/src/math/smoke/fminimumbf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimumbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fminimumbf16.h"
 
-LIST_FMINIMUM_TESTS(bfloat16, LIBC_NAMESPACE::fminimumbf16)
+LIST_FMINIMUM_TESTS(Fminimumbf16, bfloat16, LIBC_NAMESPACE::fminimumbf16)
diff --git a/libc/test/src/math/smoke/fminimumf128_test.cpp b/libc/test/src/math/smoke/fminimumf128_test.cpp
index 901656c7b88ac..1f7353af90b17 100644
--- a/libc/test/src/math/smoke/fminimumf128_test.cpp
+++ b/libc/test/src/math/smoke/fminimumf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_FMINIMUM_TESTS(float128, LIBC_NAMESPACE::fminimumf128)
+LIST_FMINIMUM_TESTS(Fminimumf128, float128, LIBC_NAMESPACE::fminimumf128)
diff --git a/libc/test/src/math/smoke/fminimumf16_test.cpp b/libc/test/src/math/smoke/fminimumf16_test.cpp
index f8b0577490b9f..ad1d6a9540f02 100644
--- a/libc/test/src/math/smoke/fminimumf16_test.cpp
+++ b/libc/test/src/math/smoke/fminimumf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimumf16.h"
 
-LIST_FMINIMUM_TESTS(float16, LIBC_NAMESPACE::fminimumf16)
+LIST_FMINIMUM_TESTS(Fminimumf16, float16, LIBC_NAMESPACE::fminimumf16)
diff --git a/libc/test/src/math/smoke/fminimumf_test.cpp b/libc/test/src/math/smoke/fminimumf_test.cpp
index 2ca0f2f35a7ff..4c06b506687a1 100644
--- a/libc/test/src/math/smoke/fminimumf_test.cpp
+++ b/libc/test/src/math/smoke/fminimumf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimumf.h"
 
-LIST_FMINIMUM_TESTS(float, LIBC_NAMESPACE::fminimumf)
+LIST_FMINIMUM_TESTS(Fminimumf, float, LIBC_NAMESPACE::fminimumf)
diff --git a/libc/test/src/math/smoke/fminimuml_test.cpp b/libc/test/src/math/smoke/fminimuml_test.cpp
index 3c067ae23f45d..127d277c12c1b 100644
--- a/libc/test/src/math/smoke/fminimuml_test.cpp
+++ b/libc/test/src/math/smoke/fminimuml_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminimuml.h"
 
-LIST_FMINIMUM_TESTS(long double, LIBC_NAMESPACE::fminimuml)
+LIST_FMINIMUM_TESTS(Fminimuml, long double, LIBC_NAMESPACE::fminimuml)
diff --git a/libc/test/src/math/smoke/fminl_test.cpp b/libc/test/src/math/smoke/fminl_test.cpp
index 0791f8c4ad859..229c51cd1179c 100644
--- a/libc/test/src/math/smoke/fminl_test.cpp
+++ b/libc/test/src/math/smoke/fminl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fminl.h"
 
-LIST_FMIN_TESTS(long double, LIBC_NAMESPACE::fminl)
+LIST_FMIN_TESTS(Fminl, long double, LIBC_NAMESPACE::fminl)
diff --git a/libc/test/src/math/smoke/fmod_test.cpp b/libc/test/src/math/smoke/fmod_test.cpp
index ec39e0567a7ca..4482ccaaa7517 100644
--- a/libc/test/src/math/smoke/fmod_test.cpp
+++ b/libc/test/src/math/smoke/fmod_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmod.h"
 
-LIST_FMOD_TESTS(double, LIBC_NAMESPACE::fmod)
+LIST_FMOD_TESTS(Fmod, double, LIBC_NAMESPACE::fmod)
diff --git a/libc/test/src/math/smoke/fmodbf16_test.cpp b/libc/test/src/math/smoke/fmodbf16_test.cpp
index 8f30941c89b6a..00bdb864e1309 100644
--- a/libc/test/src/math/smoke/fmodbf16_test.cpp
+++ b/libc/test/src/math/smoke/fmodbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fmodbf16.h"
 
-LIST_FMOD_TESTS(bfloat16, LIBC_NAMESPACE::fmodbf16)
+LIST_FMOD_TESTS(Fmodbf16, bfloat16, LIBC_NAMESPACE::fmodbf16)
diff --git a/libc/test/src/math/smoke/fmodf128_test.cpp b/libc/test/src/math/smoke/fmodf128_test.cpp
index f75aadac84386..ca8363f62f4e7 100644
--- a/libc/test/src/math/smoke/fmodf128_test.cpp
+++ b/libc/test/src/math/smoke/fmodf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmodf128.h"
 
-LIST_FMOD_TESTS(float128, LIBC_NAMESPACE::fmodf128)
+LIST_FMOD_TESTS(Fmodf128, float128, LIBC_NAMESPACE::fmodf128)
diff --git a/libc/test/src/math/smoke/fmodf16_test.cpp b/libc/test/src/math/smoke/fmodf16_test.cpp
index 9a48c5aa0d609..cc1d31d7f49a0 100644
--- a/libc/test/src/math/smoke/fmodf16_test.cpp
+++ b/libc/test/src/math/smoke/fmodf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmodf16.h"
 
-LIST_FMOD_TESTS(float16, LIBC_NAMESPACE::fmodf16)
+LIST_FMOD_TESTS(Fmodf16, float16, LIBC_NAMESPACE::fmodf16)
diff --git a/libc/test/src/math/smoke/fmodf_test.cpp b/libc/test/src/math/smoke/fmodf_test.cpp
index 5c3c6286e88fe..fb2469de93388 100644
--- a/libc/test/src/math/smoke/fmodf_test.cpp
+++ b/libc/test/src/math/smoke/fmodf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmodf.h"
 
-LIST_FMOD_TESTS(float, LIBC_NAMESPACE::fmodf)
+LIST_FMOD_TESTS(Fmodf, float, LIBC_NAMESPACE::fmodf)
diff --git a/libc/test/src/math/smoke/fmodl_test.cpp b/libc/test/src/math/smoke/fmodl_test.cpp
index b69ed8ec85c84..bb769c63d5770 100644
--- a/libc/test/src/math/smoke/fmodl_test.cpp
+++ b/libc/test/src/math/smoke/fmodl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmodl.h"
 
-LIST_FMOD_TESTS(long double, LIBC_NAMESPACE::fmodl)
+LIST_FMOD_TESTS(Fmodl, long double, LIBC_NAMESPACE::fmodl)
diff --git a/libc/test/src/math/smoke/fmul_test.cpp b/libc/test/src/math/smoke/fmul_test.cpp
index 3fcf514bcd9f0..18a224b0bacc7 100644
--- a/libc/test/src/math/smoke/fmul_test.cpp
+++ b/libc/test/src/math/smoke/fmul_test.cpp
@@ -10,9 +10,9 @@
 
 #include "src/math/fmul.h"
 
-LIST_MUL_TESTS(float, double, LIBC_NAMESPACE::fmul)
+LIST_MUL_TESTS(Fmul, float, double, LIBC_NAMESPACE::fmul)
 
-TEST_F(LlvmLibcMulTest, SpecialInputs) {
+TEST_F(LlvmLibcFmulTest, SpecialInputs) {
   constexpr double INPUTS[][2] = {
       {0x1.0100010002p8, 0x1.fffcp14},
       {0x1.000000b92144p-7, 0x1.62p7},
diff --git a/libc/test/src/math/smoke/fmulf128_test.cpp b/libc/test/src/math/smoke/fmulf128_test.cpp
index 37c8d1cf9908d..6f84abca7f181 100644
--- a/libc/test/src/math/smoke/fmulf128_test.cpp
+++ b/libc/test/src/math/smoke/fmulf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmulf128.h"
 
-LIST_MUL_TESTS(float, float128, LIBC_NAMESPACE::fmulf128)
+LIST_MUL_TESTS(Fmulf128, float, float128, LIBC_NAMESPACE::fmulf128)
diff --git a/libc/test/src/math/smoke/fmull_test.cpp b/libc/test/src/math/smoke/fmull_test.cpp
index ef694063f20dc..82101fd5b84ee 100644
--- a/libc/test/src/math/smoke/fmull_test.cpp
+++ b/libc/test/src/math/smoke/fmull_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fmull.h"
 
-LIST_MUL_TESTS(float, long double, LIBC_NAMESPACE::fmull)
+LIST_MUL_TESTS(Fmull, float, long double, LIBC_NAMESPACE::fmull)
diff --git a/libc/test/src/math/smoke/frexp_test.cpp b/libc/test/src/math/smoke/frexp_test.cpp
index 79aa9723d3147..b8de88c5f634e 100644
--- a/libc/test/src/math/smoke/frexp_test.cpp
+++ b/libc/test/src/math/smoke/frexp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexp.h"
 
-LIST_FREXP_TESTS(double, LIBC_NAMESPACE::frexp);
+LIST_FREXP_TESTS(Frexp, double, LIBC_NAMESPACE::frexp);
diff --git a/libc/test/src/math/smoke/frexpbf16_test.cpp b/libc/test/src/math/smoke/frexpbf16_test.cpp
index 3c80edbb433ba..1c603d84a776b 100644
--- a/libc/test/src/math/smoke/frexpbf16_test.cpp
+++ b/libc/test/src/math/smoke/frexpbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/frexpbf16.h"
 
-LIST_FREXP_TESTS(bfloat16, LIBC_NAMESPACE::frexpbf16);
+LIST_FREXP_TESTS(Frexpbf16, bfloat16, LIBC_NAMESPACE::frexpbf16);
diff --git a/libc/test/src/math/smoke/frexpf128_test.cpp b/libc/test/src/math/smoke/frexpf128_test.cpp
index a0df32f5fbdd9..20579f25f9361 100644
--- a/libc/test/src/math/smoke/frexpf128_test.cpp
+++ b/libc/test/src/math/smoke/frexpf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpf128.h"
 
-LIST_FREXP_TESTS(float128, LIBC_NAMESPACE::frexpf128);
+LIST_FREXP_TESTS(Frexpf128, float128, LIBC_NAMESPACE::frexpf128);
diff --git a/libc/test/src/math/smoke/frexpf16_test.cpp b/libc/test/src/math/smoke/frexpf16_test.cpp
index 4d5492c8cf0c0..ed51e7a6e95f8 100644
--- a/libc/test/src/math/smoke/frexpf16_test.cpp
+++ b/libc/test/src/math/smoke/frexpf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpf16.h"
 
-LIST_FREXP_TESTS(float16, LIBC_NAMESPACE::frexpf16);
+LIST_FREXP_TESTS(Frexpf16, float16, LIBC_NAMESPACE::frexpf16);
diff --git a/libc/test/src/math/smoke/frexpf_test.cpp b/libc/test/src/math/smoke/frexpf_test.cpp
index f2ae637e9a6c9..7dfc0849bc07c 100644
--- a/libc/test/src/math/smoke/frexpf_test.cpp
+++ b/libc/test/src/math/smoke/frexpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpf.h"
 
-LIST_FREXP_TESTS(float, LIBC_NAMESPACE::frexpf);
+LIST_FREXP_TESTS(Frexpf, float, LIBC_NAMESPACE::frexpf);
diff --git a/libc/test/src/math/smoke/frexpl_test.cpp b/libc/test/src/math/smoke/frexpl_test.cpp
index 3e1f8b4204e6a..e7ec8cf7fc100 100644
--- a/libc/test/src/math/smoke/frexpl_test.cpp
+++ b/libc/test/src/math/smoke/frexpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/frexpl.h"
 
-LIST_FREXP_TESTS(long double, LIBC_NAMESPACE::frexpl);
+LIST_FREXP_TESTS(Frexpl, long double, LIBC_NAMESPACE::frexpl);
diff --git a/libc/test/src/math/smoke/fromfp_test.cpp b/libc/test/src/math/smoke/fromfp_test.cpp
index 147a9df9afcff..4cb1ec46f9703 100644
--- a/libc/test/src/math/smoke/fromfp_test.cpp
+++ b/libc/test/src/math/smoke/fromfp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfp.h"
 
-LIST_FROMFP_TESTS(double, LIBC_NAMESPACE::fromfp)
+LIST_FROMFP_TESTS(Fromfp, double, LIBC_NAMESPACE::fromfp)
diff --git a/libc/test/src/math/smoke/fromfpbf16_test.cpp b/libc/test/src/math/smoke/fromfpbf16_test.cpp
index 45d70b2a05c4f..9a68b008d5b64 100644
--- a/libc/test/src/math/smoke/fromfpbf16_test.cpp
+++ b/libc/test/src/math/smoke/fromfpbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fromfpbf16.h"
 
-LIST_FROMFP_TESTS(bfloat16, LIBC_NAMESPACE::fromfpbf16)
+LIST_FROMFP_TESTS(Fromfpbf16, bfloat16, LIBC_NAMESPACE::fromfpbf16)
diff --git a/libc/test/src/math/smoke/fromfpf128_test.cpp b/libc/test/src/math/smoke/fromfpf128_test.cpp
index 288aadb359bfe..76e67590cd71e 100644
--- a/libc/test/src/math/smoke/fromfpf128_test.cpp
+++ b/libc/test/src/math/smoke/fromfpf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpf128.h"
 
-LIST_FROMFP_TESTS(float128, LIBC_NAMESPACE::fromfpf128)
+LIST_FROMFP_TESTS(Fromfpf128, float128, LIBC_NAMESPACE::fromfpf128)
diff --git a/libc/test/src/math/smoke/fromfpf16_test.cpp b/libc/test/src/math/smoke/fromfpf16_test.cpp
index 6c3ae94944670..62aae8f9e262a 100644
--- a/libc/test/src/math/smoke/fromfpf16_test.cpp
+++ b/libc/test/src/math/smoke/fromfpf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpf16.h"
 
-LIST_FROMFP_TESTS(float16, LIBC_NAMESPACE::fromfpf16)
+LIST_FROMFP_TESTS(Fromfpf16, float16, LIBC_NAMESPACE::fromfpf16)
diff --git a/libc/test/src/math/smoke/fromfpf_test.cpp b/libc/test/src/math/smoke/fromfpf_test.cpp
index 63f3f624716e5..6c4c60e31f7a7 100644
--- a/libc/test/src/math/smoke/fromfpf_test.cpp
+++ b/libc/test/src/math/smoke/fromfpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpf.h"
 
-LIST_FROMFP_TESTS(float, LIBC_NAMESPACE::fromfpf)
+LIST_FROMFP_TESTS(Fromfpf, float, LIBC_NAMESPACE::fromfpf)
diff --git a/libc/test/src/math/smoke/fromfpl_test.cpp b/libc/test/src/math/smoke/fromfpl_test.cpp
index c0072768870b7..710027dd321e3 100644
--- a/libc/test/src/math/smoke/fromfpl_test.cpp
+++ b/libc/test/src/math/smoke/fromfpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpl.h"
 
-LIST_FROMFP_TESTS(long double, LIBC_NAMESPACE::fromfpl)
+LIST_FROMFP_TESTS(Fromfpl, long double, LIBC_NAMESPACE::fromfpl)
diff --git a/libc/test/src/math/smoke/fromfpx_test.cpp b/libc/test/src/math/smoke/fromfpx_test.cpp
index 10b1eee726e1f..96593421fe26e 100644
--- a/libc/test/src/math/smoke/fromfpx_test.cpp
+++ b/libc/test/src/math/smoke/fromfpx_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpx.h"
 
-LIST_FROMFPX_TESTS(double, LIBC_NAMESPACE::fromfpx)
+LIST_FROMFPX_TESTS(Fromfpx, double, LIBC_NAMESPACE::fromfpx)
diff --git a/libc/test/src/math/smoke/fromfpxbf16_test.cpp b/libc/test/src/math/smoke/fromfpxbf16_test.cpp
index d930ba3f48734..6dc21edec672f 100644
--- a/libc/test/src/math/smoke/fromfpxbf16_test.cpp
+++ b/libc/test/src/math/smoke/fromfpxbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/fromfpxbf16.h"
 
-LIST_FROMFPX_TESTS(bfloat16, LIBC_NAMESPACE::fromfpxbf16)
+LIST_FROMFPX_TESTS(Fromfpxbf16, bfloat16, LIBC_NAMESPACE::fromfpxbf16)
diff --git a/libc/test/src/math/smoke/fromfpxf128_test.cpp b/libc/test/src/math/smoke/fromfpxf128_test.cpp
index 2839bed30cb7c..e9d181d582581 100644
--- a/libc/test/src/math/smoke/fromfpxf128_test.cpp
+++ b/libc/test/src/math/smoke/fromfpxf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpxf128.h"
 
-LIST_FROMFPX_TESTS(float128, LIBC_NAMESPACE::fromfpxf128)
+LIST_FROMFPX_TESTS(Fromfpxf128, float128, LIBC_NAMESPACE::fromfpxf128)
diff --git a/libc/test/src/math/smoke/fromfpxf16_test.cpp b/libc/test/src/math/smoke/fromfpxf16_test.cpp
index 04ab9e6615b3a..aa8dbd88d45bc 100644
--- a/libc/test/src/math/smoke/fromfpxf16_test.cpp
+++ b/libc/test/src/math/smoke/fromfpxf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpxf16.h"
 
-LIST_FROMFPX_TESTS(float16, LIBC_NAMESPACE::fromfpxf16)
+LIST_FROMFPX_TESTS(Fromfpxf16, float16, LIBC_NAMESPACE::fromfpxf16)
diff --git a/libc/test/src/math/smoke/fromfpxf_test.cpp b/libc/test/src/math/smoke/fromfpxf_test.cpp
index 42e47aba40ae7..2b52031c233b2 100644
--- a/libc/test/src/math/smoke/fromfpxf_test.cpp
+++ b/libc/test/src/math/smoke/fromfpxf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpxf.h"
 
-LIST_FROMFPX_TESTS(float, LIBC_NAMESPACE::fromfpxf)
+LIST_FROMFPX_TESTS(Fromfpxf, float, LIBC_NAMESPACE::fromfpxf)
diff --git a/libc/test/src/math/smoke/fromfpxl_test.cpp b/libc/test/src/math/smoke/fromfpxl_test.cpp
index cbe8d750ff2a6..ea303adc03a38 100644
--- a/libc/test/src/math/smoke/fromfpxl_test.cpp
+++ b/libc/test/src/math/smoke/fromfpxl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fromfpxl.h"
 
-LIST_FROMFPX_TESTS(long double, LIBC_NAMESPACE::fromfpxl)
+LIST_FROMFPX_TESTS(Fromfpxl, long double, LIBC_NAMESPACE::fromfpxl)
diff --git a/libc/test/src/math/smoke/fsqrt_test.cpp b/libc/test/src/math/smoke/fsqrt_test.cpp
index 8471e3c9365e9..c734b6a33cc7a 100644
--- a/libc/test/src/math/smoke/fsqrt_test.cpp
+++ b/libc/test/src/math/smoke/fsqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsqrt.h"
 
-LIST_NARROWING_SQRT_TESTS(float, double, LIBC_NAMESPACE::fsqrt)
+LIST_NARROWING_SQRT_TESTS(Fsqrt, float, double, LIBC_NAMESPACE::fsqrt)
diff --git a/libc/test/src/math/smoke/fsqrtf128_test.cpp b/libc/test/src/math/smoke/fsqrtf128_test.cpp
index b125a35b09b9e..d18962e8845d5 100644
--- a/libc/test/src/math/smoke/fsqrtf128_test.cpp
+++ b/libc/test/src/math/smoke/fsqrtf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsqrtf128.h"
 
-LIST_NARROWING_SQRT_TESTS(float, float128, LIBC_NAMESPACE::fsqrtf128)
+LIST_NARROWING_SQRT_TESTS(Fsqrtf128, float, float128, LIBC_NAMESPACE::fsqrtf128)
diff --git a/libc/test/src/math/smoke/fsqrtl_test.cpp b/libc/test/src/math/smoke/fsqrtl_test.cpp
index 1082a33466857..af94d70b9fefb 100644
--- a/libc/test/src/math/smoke/fsqrtl_test.cpp
+++ b/libc/test/src/math/smoke/fsqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsqrtl.h"
 
-LIST_NARROWING_SQRT_TESTS(float, long double, LIBC_NAMESPACE::fsqrtl)
+LIST_NARROWING_SQRT_TESTS(Fsqrtl, float, long double, LIBC_NAMESPACE::fsqrtl)
diff --git a/libc/test/src/math/smoke/fsub_test.cpp b/libc/test/src/math/smoke/fsub_test.cpp
index 3c825f7f28af4..0e7805cb67c3f 100644
--- a/libc/test/src/math/smoke/fsub_test.cpp
+++ b/libc/test/src/math/smoke/fsub_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsub.h"
 
-LIST_SUB_TESTS(float, double, LIBC_NAMESPACE::fsub)
+LIST_SUB_TESTS(Fsub, float, double, LIBC_NAMESPACE::fsub)
diff --git a/libc/test/src/math/smoke/fsubf128_test.cpp b/libc/test/src/math/smoke/fsubf128_test.cpp
index 8f46d91116bde..0dbb60fe95400 100644
--- a/libc/test/src/math/smoke/fsubf128_test.cpp
+++ b/libc/test/src/math/smoke/fsubf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsubf128.h"
 
-LIST_SUB_TESTS(float, float128, LIBC_NAMESPACE::fsubf128)
+LIST_SUB_TESTS(Fsubf128, float, float128, LIBC_NAMESPACE::fsubf128)
diff --git a/libc/test/src/math/smoke/fsubl_test.cpp b/libc/test/src/math/smoke/fsubl_test.cpp
index 8723432603b00..3a0e3e8683bad 100644
--- a/libc/test/src/math/smoke/fsubl_test.cpp
+++ b/libc/test/src/math/smoke/fsubl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/fsubl.h"
 
-LIST_SUB_TESTS(float, long double, LIBC_NAMESPACE::fsubl)
+LIST_SUB_TESTS(Fsubl, float, long double, LIBC_NAMESPACE::fsubl)
diff --git a/libc/test/src/math/smoke/generic_sqrt_test.cpp b/libc/test/src/math/smoke/generic_sqrt_test.cpp
index 4451e5e82d2d4..6a01bd0df0bad 100644
--- a/libc/test/src/math/smoke/generic_sqrt_test.cpp
+++ b/libc/test/src/math/smoke/generic_sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(double, LIBC_NAMESPACE::fputil::sqrt<double>);
+LIST_SQRT_TESTS(GenericSqrt, double, LIBC_NAMESPACE::fputil::sqrt<double>);
diff --git a/libc/test/src/math/smoke/generic_sqrtf128_test.cpp b/libc/test/src/math/smoke/generic_sqrtf128_test.cpp
index e35d522597fa1..4fdb4d2728025 100644
--- a/libc/test/src/math/smoke/generic_sqrtf128_test.cpp
+++ b/libc/test/src/math/smoke/generic_sqrtf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_SQRT_TESTS(float128, LIBC_NAMESPACE::fputil::sqrt<float128>);
+LIST_SQRT_TESTS(GenericSqrtf128, float128,
+                LIBC_NAMESPACE::fputil::sqrt<float128>);
diff --git a/libc/test/src/math/smoke/generic_sqrtf_test.cpp b/libc/test/src/math/smoke/generic_sqrtf_test.cpp
index e04d4c4f26d63..1d2517d1b677a 100644
--- a/libc/test/src/math/smoke/generic_sqrtf_test.cpp
+++ b/libc/test/src/math/smoke/generic_sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(float, LIBC_NAMESPACE::fputil::sqrt<float>);
+LIST_SQRT_TESTS(GenericSqrtf, float, LIBC_NAMESPACE::fputil::sqrt<float>);
diff --git a/libc/test/src/math/smoke/generic_sqrtl_test.cpp b/libc/test/src/math/smoke/generic_sqrtl_test.cpp
index ccb5054296115..f0ae5b2548f7b 100644
--- a/libc/test/src/math/smoke/generic_sqrtl_test.cpp
+++ b/libc/test/src/math/smoke/generic_sqrtl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/__support/FPUtil/generic/sqrt.h"
 
-LIST_SQRT_TESTS(long double, LIBC_NAMESPACE::fputil::sqrt<long double>);
+LIST_SQRT_TESTS(GenericSqrtl, long double,
+                LIBC_NAMESPACE::fputil::sqrt<long double>);
diff --git a/libc/test/src/math/smoke/getpayload_test.cpp b/libc/test/src/math/smoke/getpayload_test.cpp
index f157d4572d09a..92651b022fce7 100644
--- a/libc/test/src/math/smoke/getpayload_test.cpp
+++ b/libc/test/src/math/smoke/getpayload_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/getpayload.h"
 
-LIST_GETPAYLOAD_TESTS(double, LIBC_NAMESPACE::getpayload)
+LIST_GETPAYLOAD_TESTS(Getpayload, double, LIBC_NAMESPACE::getpayload)
diff --git a/libc/test/src/math/smoke/getpayloadbf16_test.cpp b/libc/test/src/math/smoke/getpayloadbf16_test.cpp
index 51a5fad88cd97..1a0dce6d410ab 100644
--- a/libc/test/src/math/smoke/getpayloadbf16_test.cpp
+++ b/libc/test/src/math/smoke/getpayloadbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/getpayloadbf16.h"
 
-LIST_GETPAYLOAD_TESTS(bfloat16, LIBC_NAMESPACE::getpayloadbf16)
+LIST_GETPAYLOAD_TESTS(Getpayloadbf16, bfloat16, LIBC_NAMESPACE::getpayloadbf16)
diff --git a/libc/test/src/math/smoke/getpayloadf128_test.cpp b/libc/test/src/math/smoke/getpayloadf128_test.cpp
index 37bb506a3ed16..77304abfbbc0a 100644
--- a/libc/test/src/math/smoke/getpayloadf128_test.cpp
+++ b/libc/test/src/math/smoke/getpayloadf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/getpayloadf128.h"
 
-LIST_GETPAYLOAD_TESTS(float128, LIBC_NAMESPACE::getpayloadf128)
+LIST_GETPAYLOAD_TESTS(Getpayloadf128, float128, LIBC_NAMESPACE::getpayloadf128)
diff --git a/libc/test/src/math/smoke/getpayloadf16_test.cpp b/libc/test/src/math/smoke/getpayloadf16_test.cpp
index 385b04701b8bb..a7befe64d25ae 100644
--- a/libc/test/src/math/smoke/getpayloadf16_test.cpp
+++ b/libc/test/src/math/smoke/getpayloadf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/getpayloadf16.h"
 
-LIST_GETPAYLOAD_TESTS(float16, LIBC_NAMESPACE::getpayloadf16)
+LIST_GETPAYLOAD_TESTS(Getpayloadf16, float16, LIBC_NAMESPACE::getpayloadf16)
diff --git a/libc/test/src/math/smoke/getpayloadf_test.cpp b/libc/test/src/math/smoke/getpayloadf_test.cpp
index 89ed02487df04..8111b2c75b8f2 100644
--- a/libc/test/src/math/smoke/getpayloadf_test.cpp
+++ b/libc/test/src/math/smoke/getpayloadf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/getpayloadf.h"
 
-LIST_GETPAYLOAD_TESTS(float, LIBC_NAMESPACE::getpayloadf)
+LIST_GETPAYLOAD_TESTS(Getpayloadf, float, LIBC_NAMESPACE::getpayloadf)
diff --git a/libc/test/src/math/smoke/getpayloadl_test.cpp b/libc/test/src/math/smoke/getpayloadl_test.cpp
index d783548c67032..317ea6fe5f94f 100644
--- a/libc/test/src/math/smoke/getpayloadl_test.cpp
+++ b/libc/test/src/math/smoke/getpayloadl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/getpayloadl.h"
 
-LIST_GETPAYLOAD_TESTS(long double, LIBC_NAMESPACE::getpayloadl)
+LIST_GETPAYLOAD_TESTS(Getpayloadl, long double, LIBC_NAMESPACE::getpayloadl)
diff --git a/libc/test/src/math/smoke/ilogb_test.cpp b/libc/test/src/math/smoke/ilogb_test.cpp
index 67c7939608e8b..613991a565d6d 100644
--- a/libc/test/src/math/smoke/ilogb_test.cpp
+++ b/libc/test/src/math/smoke/ilogb_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ilogb.h"
 
-LIST_INTLOGB_TESTS(int, double, LIBC_NAMESPACE::ilogb);
+LIST_INTLOGB_TESTS(Ilogb, int, double, LIBC_NAMESPACE::ilogb);
diff --git a/libc/test/src/math/smoke/ilogbbf16_test.cpp b/libc/test/src/math/smoke/ilogbbf16_test.cpp
index d9fa03a2e50cb..d47f2273a0617 100644
--- a/libc/test/src/math/smoke/ilogbbf16_test.cpp
+++ b/libc/test/src/math/smoke/ilogbbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ilogbbf16.h"
 
-LIST_INTLOGB_TESTS(int, bfloat16, LIBC_NAMESPACE::ilogbbf16);
+LIST_INTLOGB_TESTS(Ilogbbf16, int, bfloat16, LIBC_NAMESPACE::ilogbbf16);
diff --git a/libc/test/src/math/smoke/ilogbf128_test.cpp b/libc/test/src/math/smoke/ilogbf128_test.cpp
index 21ed0dd112b91..48ba5e0e060eb 100644
--- a/libc/test/src/math/smoke/ilogbf128_test.cpp
+++ b/libc/test/src/math/smoke/ilogbf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ilogbf128.h"
 
-LIST_INTLOGB_TESTS(int, float128, LIBC_NAMESPACE::ilogbf128);
+LIST_INTLOGB_TESTS(Ilogbf128, int, float128, LIBC_NAMESPACE::ilogbf128);
diff --git a/libc/test/src/math/smoke/ilogbf16_test.cpp b/libc/test/src/math/smoke/ilogbf16_test.cpp
index e046709523202..3066f494f9343 100644
--- a/libc/test/src/math/smoke/ilogbf16_test.cpp
+++ b/libc/test/src/math/smoke/ilogbf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ilogbf16.h"
 
-LIST_INTLOGB_TESTS(int, float16, LIBC_NAMESPACE::ilogbf16);
+LIST_INTLOGB_TESTS(Ilogbf16, int, float16, LIBC_NAMESPACE::ilogbf16);
diff --git a/libc/test/src/math/smoke/ilogbf_test.cpp b/libc/test/src/math/smoke/ilogbf_test.cpp
index 68e6950cdf725..d3b79ee2b85f5 100644
--- a/libc/test/src/math/smoke/ilogbf_test.cpp
+++ b/libc/test/src/math/smoke/ilogbf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ilogbf.h"
 
-LIST_INTLOGB_TESTS(int, float, LIBC_NAMESPACE::ilogbf);
+LIST_INTLOGB_TESTS(Ilogbf, int, float, LIBC_NAMESPACE::ilogbf);
diff --git a/libc/test/src/math/smoke/ilogbl_test.cpp b/libc/test/src/math/smoke/ilogbl_test.cpp
index afc961f168639..387cbd171839a 100644
--- a/libc/test/src/math/smoke/ilogbl_test.cpp
+++ b/libc/test/src/math/smoke/ilogbl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ilogbl.h"
 
-LIST_INTLOGB_TESTS(int, long double, LIBC_NAMESPACE::ilogbl);
+LIST_INTLOGB_TESTS(Ilogbl, int, long double, LIBC_NAMESPACE::ilogbl);
diff --git a/libc/test/src/math/smoke/iscanonical_test.cpp b/libc/test/src/math/smoke/iscanonical_test.cpp
index 8e8b3e4308f88..e1f41e23556bc 100644
--- a/libc/test/src/math/smoke/iscanonical_test.cpp
+++ b/libc/test/src/math/smoke/iscanonical_test.cpp
@@ -14,4 +14,4 @@
 
 #include "src/math/iscanonical.h"
 
-LIST_ISCANONICAL_TESTS(double, LIBC_NAMESPACE::iscanonical)
+LIST_ISCANONICAL_TESTS(Iscanonical, double, LIBC_NAMESPACE::iscanonical)
diff --git a/libc/test/src/math/smoke/iscanonicalbf16_test.cpp b/libc/test/src/math/smoke/iscanonicalbf16_test.cpp
index 3d735882e82a3..77e0b4d2e78ab 100644
--- a/libc/test/src/math/smoke/iscanonicalbf16_test.cpp
+++ b/libc/test/src/math/smoke/iscanonicalbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/iscanonicalbf16.h"
 
-LIST_ISCANONICAL_TESTS(bfloat16, LIBC_NAMESPACE::iscanonicalbf16)
+LIST_ISCANONICAL_TESTS(Iscanonicalbf16, bfloat16,
+                       LIBC_NAMESPACE::iscanonicalbf16)
diff --git a/libc/test/src/math/smoke/iscanonicalf128_test.cpp b/libc/test/src/math/smoke/iscanonicalf128_test.cpp
index 7c93315ac8560..59e466b50450a 100644
--- a/libc/test/src/math/smoke/iscanonicalf128_test.cpp
+++ b/libc/test/src/math/smoke/iscanonicalf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ISCANONICAL_TESTS(float128, LIBC_NAMESPACE::iscanonicalf128)
+LIST_ISCANONICAL_TESTS(Iscanonicalf128, float128,
+                       LIBC_NAMESPACE::iscanonicalf128)
diff --git a/libc/test/src/math/smoke/iscanonicalf16_test.cpp b/libc/test/src/math/smoke/iscanonicalf16_test.cpp
index d17d79f86139e..3dac7406a3baf 100644
--- a/libc/test/src/math/smoke/iscanonicalf16_test.cpp
+++ b/libc/test/src/math/smoke/iscanonicalf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/iscanonicalf16.h"
 
-LIST_ISCANONICAL_TESTS(float16, LIBC_NAMESPACE::iscanonicalf16)
+LIST_ISCANONICAL_TESTS(Iscanonicalf16, float16, LIBC_NAMESPACE::iscanonicalf16)
diff --git a/libc/test/src/math/smoke/iscanonicalf_test.cpp b/libc/test/src/math/smoke/iscanonicalf_test.cpp
index eba8688f61f94..8a62a09b7f108 100644
--- a/libc/test/src/math/smoke/iscanonicalf_test.cpp
+++ b/libc/test/src/math/smoke/iscanonicalf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/iscanonicalf.h"
 
-LIST_ISCANONICAL_TESTS(float, LIBC_NAMESPACE::iscanonicalf)
+LIST_ISCANONICAL_TESTS(Iscanonicalf, float, LIBC_NAMESPACE::iscanonicalf)
diff --git a/libc/test/src/math/smoke/iscanonicall_test.cpp b/libc/test/src/math/smoke/iscanonicall_test.cpp
index d180bcb7443e5..12fa6fd0cdd08 100644
--- a/libc/test/src/math/smoke/iscanonicall_test.cpp
+++ b/libc/test/src/math/smoke/iscanonicall_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/iscanonicall.h"
 
-LIST_ISCANONICAL_TESTS(long double, LIBC_NAMESPACE::iscanonicall)
+LIST_ISCANONICAL_TESTS(Iscanonicall, long double, LIBC_NAMESPACE::iscanonicall)
diff --git a/libc/test/src/math/smoke/isnanf128_test.cpp b/libc/test/src/math/smoke/isnanf128_test.cpp
index 70af9b6b71af2..3c9ebe1eb3bd9 100644
--- a/libc/test/src/math/smoke/isnanf128_test.cpp
+++ b/libc/test/src/math/smoke/isnanf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ISNAN_TESTS(float128, LIBC_NAMESPACE::isnanf128)
+LIST_ISNAN_TESTS(Isnanf128, float128, LIBC_NAMESPACE::isnanf128)
diff --git a/libc/test/src/math/smoke/isnanf16_test.cpp b/libc/test/src/math/smoke/isnanf16_test.cpp
index a398a0b44dd90..30d2219db1f2b 100644
--- a/libc/test/src/math/smoke/isnanf16_test.cpp
+++ b/libc/test/src/math/smoke/isnanf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/isnanf16.h"
 
-LIST_ISNAN_TESTS(float16, LIBC_NAMESPACE::isnanf16)
+LIST_ISNAN_TESTS(Isnanf16, float16, LIBC_NAMESPACE::isnanf16)
diff --git a/libc/test/src/math/smoke/issignaling_test.cpp b/libc/test/src/math/smoke/issignaling_test.cpp
index 4292cbbb852b4..e81680795b805 100644
--- a/libc/test/src/math/smoke/issignaling_test.cpp
+++ b/libc/test/src/math/smoke/issignaling_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/issignaling.h"
 
-LIST_ISSIGNALING_TESTS(double, LIBC_NAMESPACE::issignaling)
+LIST_ISSIGNALING_TESTS(Issignaling, double, LIBC_NAMESPACE::issignaling)
diff --git a/libc/test/src/math/smoke/issignalingbf16_test.cpp b/libc/test/src/math/smoke/issignalingbf16_test.cpp
index ed7e5af4aa41f..adb661d61dabb 100644
--- a/libc/test/src/math/smoke/issignalingbf16_test.cpp
+++ b/libc/test/src/math/smoke/issignalingbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/issignalingbf16.h"
 
-LIST_ISSIGNALING_TESTS(bfloat16, LIBC_NAMESPACE::issignalingbf16)
+LIST_ISSIGNALING_TESTS(Issignalingbf16, bfloat16,
+                       LIBC_NAMESPACE::issignalingbf16)
diff --git a/libc/test/src/math/smoke/issignalingf128_test.cpp b/libc/test/src/math/smoke/issignalingf128_test.cpp
index e856e2e60b33f..0f46154e7b9bd 100644
--- a/libc/test/src/math/smoke/issignalingf128_test.cpp
+++ b/libc/test/src/math/smoke/issignalingf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ISSIGNALING_TESTS(float128, LIBC_NAMESPACE::issignalingf128)
+LIST_ISSIGNALING_TESTS(Issignalingf128, float128,
+                       LIBC_NAMESPACE::issignalingf128)
diff --git a/libc/test/src/math/smoke/issignalingf16_test.cpp b/libc/test/src/math/smoke/issignalingf16_test.cpp
index fc2a65a329183..17fcec3db00b9 100644
--- a/libc/test/src/math/smoke/issignalingf16_test.cpp
+++ b/libc/test/src/math/smoke/issignalingf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/issignalingf16.h"
 
-LIST_ISSIGNALING_TESTS(float16, LIBC_NAMESPACE::issignalingf16)
+LIST_ISSIGNALING_TESTS(Issignalingf16, float16, LIBC_NAMESPACE::issignalingf16)
diff --git a/libc/test/src/math/smoke/issignalingf_test.cpp b/libc/test/src/math/smoke/issignalingf_test.cpp
index 0ceb9a80c0310..c5623340158e2 100644
--- a/libc/test/src/math/smoke/issignalingf_test.cpp
+++ b/libc/test/src/math/smoke/issignalingf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/issignalingf.h"
 
-LIST_ISSIGNALING_TESTS(float, LIBC_NAMESPACE::issignalingf)
+LIST_ISSIGNALING_TESTS(Issignalingf, float, LIBC_NAMESPACE::issignalingf)
diff --git a/libc/test/src/math/smoke/issignalingl_test.cpp b/libc/test/src/math/smoke/issignalingl_test.cpp
index 049769009ba7c..c31c5511c0e04 100644
--- a/libc/test/src/math/smoke/issignalingl_test.cpp
+++ b/libc/test/src/math/smoke/issignalingl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/issignalingl.h"
 
-LIST_ISSIGNALING_TESTS(long double, LIBC_NAMESPACE::issignalingl)
+LIST_ISSIGNALING_TESTS(Issignalingl, long double, LIBC_NAMESPACE::issignalingl)
diff --git a/libc/test/src/math/smoke/ldexp_test.cpp b/libc/test/src/math/smoke/ldexp_test.cpp
index adbf603b1e96e..542e60d482f62 100644
--- a/libc/test/src/math/smoke/ldexp_test.cpp
+++ b/libc/test/src/math/smoke/ldexp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexp.h"
 
-LIST_LDEXP_TESTS(double, LIBC_NAMESPACE::ldexp);
+LIST_LDEXP_TESTS(Ldexp, double, LIBC_NAMESPACE::ldexp);
diff --git a/libc/test/src/math/smoke/ldexpbf16_test.cpp b/libc/test/src/math/smoke/ldexpbf16_test.cpp
index 2e57eb8460c9e..c6f0f4552d9aa 100644
--- a/libc/test/src/math/smoke/ldexpbf16_test.cpp
+++ b/libc/test/src/math/smoke/ldexpbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ldexpbf16.h"
 
-LIST_LDEXP_TESTS(bfloat16, LIBC_NAMESPACE::ldexpbf16);
+LIST_LDEXP_TESTS(Ldexpbf16, bfloat16, LIBC_NAMESPACE::ldexpbf16);
diff --git a/libc/test/src/math/smoke/ldexpf128_test.cpp b/libc/test/src/math/smoke/ldexpf128_test.cpp
index 7ab34a4ce15de..ffef4fbe99a6d 100644
--- a/libc/test/src/math/smoke/ldexpf128_test.cpp
+++ b/libc/test/src/math/smoke/ldexpf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpf128.h"
 
-LIST_LDEXP_TESTS(float128, LIBC_NAMESPACE::ldexpf128);
+LIST_LDEXP_TESTS(Ldexpf128, float128, LIBC_NAMESPACE::ldexpf128);
diff --git a/libc/test/src/math/smoke/ldexpf16_test.cpp b/libc/test/src/math/smoke/ldexpf16_test.cpp
index ecf8f76a3aac8..ad412758db507 100644
--- a/libc/test/src/math/smoke/ldexpf16_test.cpp
+++ b/libc/test/src/math/smoke/ldexpf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpf16.h"
 
-LIST_LDEXP_TESTS(float16, LIBC_NAMESPACE::ldexpf16);
+LIST_LDEXP_TESTS(Ldexpf16, float16, LIBC_NAMESPACE::ldexpf16);
diff --git a/libc/test/src/math/smoke/ldexpf_test.cpp b/libc/test/src/math/smoke/ldexpf_test.cpp
index 02fd8c56effce..aa82536a88ace 100644
--- a/libc/test/src/math/smoke/ldexpf_test.cpp
+++ b/libc/test/src/math/smoke/ldexpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpf.h"
 
-LIST_LDEXP_TESTS(float, LIBC_NAMESPACE::ldexpf);
+LIST_LDEXP_TESTS(Ldexpf, float, LIBC_NAMESPACE::ldexpf);
diff --git a/libc/test/src/math/smoke/ldexpl_test.cpp b/libc/test/src/math/smoke/ldexpl_test.cpp
index 9bc17c5c7df70..2ddcc91aa82e5 100644
--- a/libc/test/src/math/smoke/ldexpl_test.cpp
+++ b/libc/test/src/math/smoke/ldexpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ldexpl.h"
 
-LIST_LDEXP_TESTS(long double, LIBC_NAMESPACE::ldexpl);
+LIST_LDEXP_TESTS(Ldexpl, long double, LIBC_NAMESPACE::ldexpl);
diff --git a/libc/test/src/math/smoke/llogb_test.cpp b/libc/test/src/math/smoke/llogb_test.cpp
index 3bccded6c3e33..195e54060f2db 100644
--- a/libc/test/src/math/smoke/llogb_test.cpp
+++ b/libc/test/src/math/smoke/llogb_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llogb.h"
 
-LIST_INTLOGB_TESTS(long, double, LIBC_NAMESPACE::llogb);
+LIST_INTLOGB_TESTS(Llogb, long, double, LIBC_NAMESPACE::llogb);
diff --git a/libc/test/src/math/smoke/llogbbf16_test.cpp b/libc/test/src/math/smoke/llogbbf16_test.cpp
index 4454fbfb0644b..c86a07583b87d 100644
--- a/libc/test/src/math/smoke/llogbbf16_test.cpp
+++ b/libc/test/src/math/smoke/llogbbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/llogbbf16.h"
 
-LIST_INTLOGB_TESTS(long, bfloat16, LIBC_NAMESPACE::llogbbf16);
+LIST_INTLOGB_TESTS(Llogbbf16, long, bfloat16, LIBC_NAMESPACE::llogbbf16);
diff --git a/libc/test/src/math/smoke/llogbf128_test.cpp b/libc/test/src/math/smoke/llogbf128_test.cpp
index a1d2021d2a378..c3263f1f2d1ee 100644
--- a/libc/test/src/math/smoke/llogbf128_test.cpp
+++ b/libc/test/src/math/smoke/llogbf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llogbf128.h"
 
-LIST_INTLOGB_TESTS(long, float128, LIBC_NAMESPACE::llogbf128);
+LIST_INTLOGB_TESTS(Llogbf128, long, float128, LIBC_NAMESPACE::llogbf128);
diff --git a/libc/test/src/math/smoke/llogbf16_test.cpp b/libc/test/src/math/smoke/llogbf16_test.cpp
index 8907681024b1b..4a2fdda6eab5a 100644
--- a/libc/test/src/math/smoke/llogbf16_test.cpp
+++ b/libc/test/src/math/smoke/llogbf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llogbf16.h"
 
-LIST_INTLOGB_TESTS(long, float16, LIBC_NAMESPACE::llogbf16);
+LIST_INTLOGB_TESTS(Llogbf16, long, float16, LIBC_NAMESPACE::llogbf16);
diff --git a/libc/test/src/math/smoke/llogbf_test.cpp b/libc/test/src/math/smoke/llogbf_test.cpp
index 60c92fbc2c461..80908f33f8d7f 100644
--- a/libc/test/src/math/smoke/llogbf_test.cpp
+++ b/libc/test/src/math/smoke/llogbf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llogbf.h"
 
-LIST_INTLOGB_TESTS(long, float, LIBC_NAMESPACE::llogbf);
+LIST_INTLOGB_TESTS(Llogbf, long, float, LIBC_NAMESPACE::llogbf);
diff --git a/libc/test/src/math/smoke/llogbl_test.cpp b/libc/test/src/math/smoke/llogbl_test.cpp
index c698210fc3de1..3e221efbb8fe9 100644
--- a/libc/test/src/math/smoke/llogbl_test.cpp
+++ b/libc/test/src/math/smoke/llogbl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llogbl.h"
 
-LIST_INTLOGB_TESTS(long, long double, LIBC_NAMESPACE::llogbl);
+LIST_INTLOGB_TESTS(Llogbl, long, long double, LIBC_NAMESPACE::llogbl);
diff --git a/libc/test/src/math/smoke/llrint_test.cpp b/libc/test/src/math/smoke/llrint_test.cpp
index 8cf7d92095891..689b5504e10b4 100644
--- a/libc/test/src/math/smoke/llrint_test.cpp
+++ b/libc/test/src/math/smoke/llrint_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrint.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(double, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrint, double, long long,
                                        LIBC_NAMESPACE::llrint)
diff --git a/libc/test/src/math/smoke/llrintbf16_test.cpp b/libc/test/src/math/smoke/llrintbf16_test.cpp
index e841e627e2634..1d8d392673c49 100644
--- a/libc/test/src/math/smoke/llrintbf16_test.cpp
+++ b/libc/test/src/math/smoke/llrintbf16_test.cpp
@@ -11,5 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/llrintbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(bfloat16, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintbf16, bfloat16, long long,
                                        LIBC_NAMESPACE::llrintbf16)
diff --git a/libc/test/src/math/smoke/llrintf128_test.cpp b/libc/test/src/math/smoke/llrintf128_test.cpp
index d7fcfd2bb211d..d5975a4a95286 100644
--- a/libc/test/src/math/smoke/llrintf128_test.cpp
+++ b/libc/test/src/math/smoke/llrintf128_test.cpp
@@ -15,5 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float128, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintf128, float128, long long,
                                        LIBC_NAMESPACE::llrintf128)
diff --git a/libc/test/src/math/smoke/llrintf16_test.cpp b/libc/test/src/math/smoke/llrintf16_test.cpp
index d16bd8f38b052..3f13426d4d9b9 100644
--- a/libc/test/src/math/smoke/llrintf16_test.cpp
+++ b/libc/test/src/math/smoke/llrintf16_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float16, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintf16, float16, long long,
                                        LIBC_NAMESPACE::llrintf16)
diff --git a/libc/test/src/math/smoke/llrintf_test.cpp b/libc/test/src/math/smoke/llrintf_test.cpp
index 0d9d3c4111bb2..dd9e94e446c17 100644
--- a/libc/test/src/math/smoke/llrintf_test.cpp
+++ b/libc/test/src/math/smoke/llrintf_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintf, float, long long,
                                        LIBC_NAMESPACE::llrintf)
diff --git a/libc/test/src/math/smoke/llrintl_test.cpp b/libc/test/src/math/smoke/llrintl_test.cpp
index 1ceb9fecc4039..76fb34ec871d4 100644
--- a/libc/test/src/math/smoke/llrintl_test.cpp
+++ b/libc/test/src/math/smoke/llrintl_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/llrintl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(long double, long long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Llrintl, long double, long long,
                                        LIBC_NAMESPACE::llrintl)
diff --git a/libc/test/src/math/smoke/llround_test.cpp b/libc/test/src/math/smoke/llround_test.cpp
index bda2fca6e8659..f66a7e90c1ff5 100644
--- a/libc/test/src/math/smoke/llround_test.cpp
+++ b/libc/test/src/math/smoke/llround_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/llround.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(double, long long, LIBC_NAMESPACE::llround)
+LIST_ROUND_TO_INTEGER_TESTS(Llround, double, long long, LIBC_NAMESPACE::llround)
diff --git a/libc/test/src/math/smoke/llroundbf16_test.cpp b/libc/test/src/math/smoke/llroundbf16_test.cpp
index c3b7ea43c3e8a..8ea8b879a56c9 100644
--- a/libc/test/src/math/smoke/llroundbf16_test.cpp
+++ b/libc/test/src/math/smoke/llroundbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/llroundbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(bfloat16, long long, LIBC_NAMESPACE::llroundbf16)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundbf16, bfloat16, long long,
+                            LIBC_NAMESPACE::llroundbf16)
diff --git a/libc/test/src/math/smoke/llroundf128_test.cpp b/libc/test/src/math/smoke/llroundf128_test.cpp
index f5b9e88366c46..10137a4f70239 100644
--- a/libc/test/src/math/smoke/llroundf128_test.cpp
+++ b/libc/test/src/math/smoke/llroundf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TO_INTEGER_TESTS(float128, long long, LIBC_NAMESPACE::llroundf128)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundf128, float128, long long,
+                            LIBC_NAMESPACE::llroundf128)
diff --git a/libc/test/src/math/smoke/llroundf16_test.cpp b/libc/test/src/math/smoke/llroundf16_test.cpp
index 9342b24fd5d04..b89bc78e6712d 100644
--- a/libc/test/src/math/smoke/llroundf16_test.cpp
+++ b/libc/test/src/math/smoke/llroundf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float16, long long, LIBC_NAMESPACE::llroundf16)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundf16, float16, long long,
+                            LIBC_NAMESPACE::llroundf16)
diff --git a/libc/test/src/math/smoke/llroundf_test.cpp b/libc/test/src/math/smoke/llroundf_test.cpp
index a35b5fabbac34..3d87e3bc7c188 100644
--- a/libc/test/src/math/smoke/llroundf_test.cpp
+++ b/libc/test/src/math/smoke/llroundf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float, long long, LIBC_NAMESPACE::llroundf)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundf, float, long long,
+                            LIBC_NAMESPACE::llroundf)
diff --git a/libc/test/src/math/smoke/llroundl_test.cpp b/libc/test/src/math/smoke/llroundl_test.cpp
index e43d49f4cbe1b..ff5027825366b 100644
--- a/libc/test/src/math/smoke/llroundl_test.cpp
+++ b/libc/test/src/math/smoke/llroundl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/llroundl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(long double, long long, LIBC_NAMESPACE::llroundl)
+LIST_ROUND_TO_INTEGER_TESTS(Llroundl, long double, long long,
+                            LIBC_NAMESPACE::llroundl)
diff --git a/libc/test/src/math/smoke/logb_test.cpp b/libc/test/src/math/smoke/logb_test.cpp
index 2dc56c2e613cc..01a2a3bd9dfba 100644
--- a/libc/test/src/math/smoke/logb_test.cpp
+++ b/libc/test/src/math/smoke/logb_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logb.h"
 
-LIST_LOGB_TESTS(double, LIBC_NAMESPACE::logb)
+LIST_LOGB_TESTS(Logb, double, LIBC_NAMESPACE::logb)
diff --git a/libc/test/src/math/smoke/logbbf16_test.cpp b/libc/test/src/math/smoke/logbbf16_test.cpp
index 4ceec3d6984dd..525bef3af6c0d 100644
--- a/libc/test/src/math/smoke/logbbf16_test.cpp
+++ b/libc/test/src/math/smoke/logbbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/logbbf16.h"
 
-LIST_LOGB_TESTS(bfloat16, LIBC_NAMESPACE::logbbf16)
+LIST_LOGB_TESTS(Logbbf16, bfloat16, LIBC_NAMESPACE::logbbf16)
diff --git a/libc/test/src/math/smoke/logbf128_test.cpp b/libc/test/src/math/smoke/logbf128_test.cpp
index 49485f8ee7144..9bfd667ee10ef 100644
--- a/libc/test/src/math/smoke/logbf128_test.cpp
+++ b/libc/test/src/math/smoke/logbf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbf128.h"
 
-LIST_LOGB_TESTS(float128, LIBC_NAMESPACE::logbf128)
+LIST_LOGB_TESTS(Logbf128, float128, LIBC_NAMESPACE::logbf128)
diff --git a/libc/test/src/math/smoke/logbf16_test.cpp b/libc/test/src/math/smoke/logbf16_test.cpp
index cfc1a0521b339..cf019787b7267 100644
--- a/libc/test/src/math/smoke/logbf16_test.cpp
+++ b/libc/test/src/math/smoke/logbf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbf16.h"
 
-LIST_LOGB_TESTS(float16, LIBC_NAMESPACE::logbf16)
+LIST_LOGB_TESTS(Logbf16, float16, LIBC_NAMESPACE::logbf16)
diff --git a/libc/test/src/math/smoke/logbf_test.cpp b/libc/test/src/math/smoke/logbf_test.cpp
index c25485ca78b06..71890487340b6 100644
--- a/libc/test/src/math/smoke/logbf_test.cpp
+++ b/libc/test/src/math/smoke/logbf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbf.h"
 
-LIST_LOGB_TESTS(float, LIBC_NAMESPACE::logbf)
+LIST_LOGB_TESTS(Logbf, float, LIBC_NAMESPACE::logbf)
diff --git a/libc/test/src/math/smoke/logbl_test.cpp b/libc/test/src/math/smoke/logbl_test.cpp
index b26cee65783c4..d17719c304aea 100644
--- a/libc/test/src/math/smoke/logbl_test.cpp
+++ b/libc/test/src/math/smoke/logbl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/logbl.h"
 
-LIST_LOGB_TESTS(long double, LIBC_NAMESPACE::logbl)
+LIST_LOGB_TESTS(Logbl, long double, LIBC_NAMESPACE::logbl)
diff --git a/libc/test/src/math/smoke/lrint_test.cpp b/libc/test/src/math/smoke/lrint_test.cpp
index 9cff266122536..274e8145ab9c5 100644
--- a/libc/test/src/math/smoke/lrint_test.cpp
+++ b/libc/test/src/math/smoke/lrint_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrint.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(double, long, LIBC_NAMESPACE::lrint)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrint, double, long,
+                                       LIBC_NAMESPACE::lrint)
diff --git a/libc/test/src/math/smoke/lrintbf16_test.cpp b/libc/test/src/math/smoke/lrintbf16_test.cpp
index 65a5633b81723..b2523263297ba 100644
--- a/libc/test/src/math/smoke/lrintbf16_test.cpp
+++ b/libc/test/src/math/smoke/lrintbf16_test.cpp
@@ -11,5 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/lrintbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(bfloat16, long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintbf16, bfloat16, long,
                                        LIBC_NAMESPACE::lrintbf16)
diff --git a/libc/test/src/math/smoke/lrintf128_test.cpp b/libc/test/src/math/smoke/lrintf128_test.cpp
index 74c33d1cd3f7d..d61a014b1603b 100644
--- a/libc/test/src/math/smoke/lrintf128_test.cpp
+++ b/libc/test/src/math/smoke/lrintf128_test.cpp
@@ -15,5 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float128, long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintf128, float128, long,
                                        LIBC_NAMESPACE::lrintf128)
diff --git a/libc/test/src/math/smoke/lrintf16_test.cpp b/libc/test/src/math/smoke/lrintf16_test.cpp
index 28b1a1cb888d7..17542a05dfec2 100644
--- a/libc/test/src/math/smoke/lrintf16_test.cpp
+++ b/libc/test/src/math/smoke/lrintf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrintf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float16, long, LIBC_NAMESPACE::lrintf16)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintf16, float16, long,
+                                       LIBC_NAMESPACE::lrintf16)
diff --git a/libc/test/src/math/smoke/lrintf_test.cpp b/libc/test/src/math/smoke/lrintf_test.cpp
index 9c696a39e6928..97bde3563db15 100644
--- a/libc/test/src/math/smoke/lrintf_test.cpp
+++ b/libc/test/src/math/smoke/lrintf_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/lrintf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(float, long, LIBC_NAMESPACE::lrintf)
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintf, float, long,
+                                       LIBC_NAMESPACE::lrintf)
diff --git a/libc/test/src/math/smoke/lrintl_test.cpp b/libc/test/src/math/smoke/lrintl_test.cpp
index e44dd30d2c6cc..0c01d56d67e89 100644
--- a/libc/test/src/math/smoke/lrintl_test.cpp
+++ b/libc/test/src/math/smoke/lrintl_test.cpp
@@ -10,5 +10,5 @@
 
 #include "src/math/lrintl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(long double, long,
+LIST_ROUND_TO_INTEGER_TESTS_WITH_MODES(Lrintl, long double, long,
                                        LIBC_NAMESPACE::lrintl)
diff --git a/libc/test/src/math/smoke/lround_test.cpp b/libc/test/src/math/smoke/lround_test.cpp
index 1fb2fc71e20cc..31990a30d1f49 100644
--- a/libc/test/src/math/smoke/lround_test.cpp
+++ b/libc/test/src/math/smoke/lround_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lround.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(double, long, LIBC_NAMESPACE::lround)
+LIST_ROUND_TO_INTEGER_TESTS(Lround, double, long, LIBC_NAMESPACE::lround)
diff --git a/libc/test/src/math/smoke/lroundbf16_test.cpp b/libc/test/src/math/smoke/lroundbf16_test.cpp
index 2f2b7b1a71b36..1c77c0fe8707b 100644
--- a/libc/test/src/math/smoke/lroundbf16_test.cpp
+++ b/libc/test/src/math/smoke/lroundbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/lroundbf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(bfloat16, long, LIBC_NAMESPACE::lroundbf16)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundbf16, bfloat16, long,
+                            LIBC_NAMESPACE::lroundbf16)
diff --git a/libc/test/src/math/smoke/lroundf128_test.cpp b/libc/test/src/math/smoke/lroundf128_test.cpp
index 6afb1a813bec0..db77a3892929b 100644
--- a/libc/test/src/math/smoke/lroundf128_test.cpp
+++ b/libc/test/src/math/smoke/lroundf128_test.cpp
@@ -15,4 +15,5 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TO_INTEGER_TESTS(float128, long, LIBC_NAMESPACE::lroundf128)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundf128, float128, long,
+                            LIBC_NAMESPACE::lroundf128)
diff --git a/libc/test/src/math/smoke/lroundf16_test.cpp b/libc/test/src/math/smoke/lroundf16_test.cpp
index 3077134d58f91..bf3d432a032f7 100644
--- a/libc/test/src/math/smoke/lroundf16_test.cpp
+++ b/libc/test/src/math/smoke/lroundf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundf16.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float16, long, LIBC_NAMESPACE::lroundf16)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundf16, float16, long, LIBC_NAMESPACE::lroundf16)
diff --git a/libc/test/src/math/smoke/lroundf_test.cpp b/libc/test/src/math/smoke/lroundf_test.cpp
index 38fe5c7d1a52d..0c1b7f06944dd 100644
--- a/libc/test/src/math/smoke/lroundf_test.cpp
+++ b/libc/test/src/math/smoke/lroundf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundf.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(float, long, LIBC_NAMESPACE::lroundf)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundf, float, long, LIBC_NAMESPACE::lroundf)
diff --git a/libc/test/src/math/smoke/lroundl_test.cpp b/libc/test/src/math/smoke/lroundl_test.cpp
index 8a29ba95a6173..999abf616b964 100644
--- a/libc/test/src/math/smoke/lroundl_test.cpp
+++ b/libc/test/src/math/smoke/lroundl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/lroundl.h"
 
-LIST_ROUND_TO_INTEGER_TESTS(long double, long, LIBC_NAMESPACE::lroundl)
+LIST_ROUND_TO_INTEGER_TESTS(Lroundl, long double, long, LIBC_NAMESPACE::lroundl)
diff --git a/libc/test/src/math/smoke/modf_test.cpp b/libc/test/src/math/smoke/modf_test.cpp
index b4b03bad848de..144ad3478346a 100644
--- a/libc/test/src/math/smoke/modf_test.cpp
+++ b/libc/test/src/math/smoke/modf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modf.h"
 
-LIST_MODF_TESTS(double, LIBC_NAMESPACE::modf)
+LIST_MODF_TESTS(Modf, double, LIBC_NAMESPACE::modf)
diff --git a/libc/test/src/math/smoke/modfbf16_test.cpp b/libc/test/src/math/smoke/modfbf16_test.cpp
index 88ebed55222ca..7de63d1623e1b 100644
--- a/libc/test/src/math/smoke/modfbf16_test.cpp
+++ b/libc/test/src/math/smoke/modfbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/modfbf16.h"
 
-LIST_MODF_TESTS(bfloat16, LIBC_NAMESPACE::modfbf16)
+LIST_MODF_TESTS(Modfbf16, bfloat16, LIBC_NAMESPACE::modfbf16)
diff --git a/libc/test/src/math/smoke/modff128_test.cpp b/libc/test/src/math/smoke/modff128_test.cpp
index 062d40138e729..de096a351afc9 100644
--- a/libc/test/src/math/smoke/modff128_test.cpp
+++ b/libc/test/src/math/smoke/modff128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modff128.h"
 
-LIST_MODF_TESTS(float128, LIBC_NAMESPACE::modff128)
+LIST_MODF_TESTS(Modff128, float128, LIBC_NAMESPACE::modff128)
diff --git a/libc/test/src/math/smoke/modff16_test.cpp b/libc/test/src/math/smoke/modff16_test.cpp
index 7093377182306..88c1b2338f076 100644
--- a/libc/test/src/math/smoke/modff16_test.cpp
+++ b/libc/test/src/math/smoke/modff16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modff16.h"
 
-LIST_MODF_TESTS(float16, LIBC_NAMESPACE::modff16)
+LIST_MODF_TESTS(Modff16, float16, LIBC_NAMESPACE::modff16)
diff --git a/libc/test/src/math/smoke/modff_test.cpp b/libc/test/src/math/smoke/modff_test.cpp
index 068dbc3f53135..c96475ee21503 100644
--- a/libc/test/src/math/smoke/modff_test.cpp
+++ b/libc/test/src/math/smoke/modff_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modff.h"
 
-LIST_MODF_TESTS(float, LIBC_NAMESPACE::modff)
+LIST_MODF_TESTS(Modff, float, LIBC_NAMESPACE::modff)
diff --git a/libc/test/src/math/smoke/modfl_test.cpp b/libc/test/src/math/smoke/modfl_test.cpp
index ae8a72642c587..cc1fea47022c2 100644
--- a/libc/test/src/math/smoke/modfl_test.cpp
+++ b/libc/test/src/math/smoke/modfl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/modfl.h"
 
-LIST_MODF_TESTS(long double, LIBC_NAMESPACE::modfl)
+LIST_MODF_TESTS(Modfl, long double, LIBC_NAMESPACE::modfl)
diff --git a/libc/test/src/math/smoke/nanbf16_test.cpp b/libc/test/src/math/smoke/nanbf16_test.cpp
index 4154f6ed637c8..8774345599adb 100644
--- a/libc/test/src/math/smoke/nanbf16_test.cpp
+++ b/libc/test/src/math/smoke/nanbf16_test.cpp
@@ -14,7 +14,7 @@
 #include "test/UnitTest/FPMatcher.h"
 #include "test/UnitTest/Test.h"
 
-class LlvmLibcNanf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+class LlvmLibcNanbf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
 public:
   using StorageType = LIBC_NAMESPACE::fputil::FPBits<bfloat16>::StorageType;
 
@@ -26,7 +26,7 @@ class LlvmLibcNanf16Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
   }
 };
 
-TEST_F(LlvmLibcNanf16Test, NCharSeq) {
+TEST_F(LlvmLibcNanbf16Test, NCharSeq) {
   run_test("", 0x7fc0);
 
   // 0x7fc0 + 0x1f (31) = 0x7cdf
@@ -41,7 +41,7 @@ TEST_F(LlvmLibcNanf16Test, NCharSeq) {
   run_test("10000000000000000000000000000", 0x7fc0);
 }
 
-TEST_F(LlvmLibcNanf16Test, RandomString) {
+TEST_F(LlvmLibcNanbf16Test, RandomString) {
   run_test(" 1234", 0x7fc0);
   run_test("-1234", 0x7fc0);
   run_test("asd&f", 0x7fc0);
@@ -49,7 +49,7 @@ TEST_F(LlvmLibcNanf16Test, RandomString) {
 }
 
 #if defined(LIBC_ADD_NULL_CHECKS)
-TEST_F(LlvmLibcNanf16Test, InvalidInput) {
+TEST_F(LlvmLibcNanbf16Test, InvalidInput) {
   EXPECT_DEATH([] { LIBC_NAMESPACE::nanbf16(nullptr); }, WITH_SIGNAL(-1));
 }
 #endif // LIBC_ADD_NULL_CHECKS
diff --git a/libc/test/src/math/smoke/nearbyint_test.cpp b/libc/test/src/math/smoke/nearbyint_test.cpp
index 11a5c3372e73e..64d93baa89b5b 100644
--- a/libc/test/src/math/smoke/nearbyint_test.cpp
+++ b/libc/test/src/math/smoke/nearbyint_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyint.h"
 
-LIST_NEARBYINT_TESTS(double, LIBC_NAMESPACE::nearbyint)
+LIST_NEARBYINT_TESTS(Nearbyint, double, LIBC_NAMESPACE::nearbyint)
diff --git a/libc/test/src/math/smoke/nearbyintbf16_test.cpp b/libc/test/src/math/smoke/nearbyintbf16_test.cpp
index 2d64fc5a154ee..ba57972c35ee5 100644
--- a/libc/test/src/math/smoke/nearbyintbf16_test.cpp
+++ b/libc/test/src/math/smoke/nearbyintbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nearbyintbf16.h"
 
-LIST_NEARBYINT_TESTS(bfloat16, LIBC_NAMESPACE::nearbyintbf16)
+LIST_NEARBYINT_TESTS(Nearbyintbf16, bfloat16, LIBC_NAMESPACE::nearbyintbf16)
diff --git a/libc/test/src/math/smoke/nearbyintf128_test.cpp b/libc/test/src/math/smoke/nearbyintf128_test.cpp
index 59a618fef7d1b..4daae07c315ec 100644
--- a/libc/test/src/math/smoke/nearbyintf128_test.cpp
+++ b/libc/test/src/math/smoke/nearbyintf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_NEARBYINT_TESTS(float128, LIBC_NAMESPACE::nearbyintf128)
+LIST_NEARBYINT_TESTS(Nearbyintf128, float128, LIBC_NAMESPACE::nearbyintf128)
diff --git a/libc/test/src/math/smoke/nearbyintf16_test.cpp b/libc/test/src/math/smoke/nearbyintf16_test.cpp
index e6ec250cec91f..60f1ee602701a 100644
--- a/libc/test/src/math/smoke/nearbyintf16_test.cpp
+++ b/libc/test/src/math/smoke/nearbyintf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintf16.h"
 
-LIST_NEARBYINT_TESTS(float16, LIBC_NAMESPACE::nearbyintf16)
+LIST_NEARBYINT_TESTS(Nearbyintf16, float16, LIBC_NAMESPACE::nearbyintf16)
diff --git a/libc/test/src/math/smoke/nearbyintf_test.cpp b/libc/test/src/math/smoke/nearbyintf_test.cpp
index fd26153cfffb9..0fb9f35a5262d 100644
--- a/libc/test/src/math/smoke/nearbyintf_test.cpp
+++ b/libc/test/src/math/smoke/nearbyintf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintf.h"
 
-LIST_NEARBYINT_TESTS(float, LIBC_NAMESPACE::nearbyintf)
+LIST_NEARBYINT_TESTS(Nearbyintf, float, LIBC_NAMESPACE::nearbyintf)
diff --git a/libc/test/src/math/smoke/nearbyintl_test.cpp b/libc/test/src/math/smoke/nearbyintl_test.cpp
index a6d81a1439e17..3c760a42151a2 100644
--- a/libc/test/src/math/smoke/nearbyintl_test.cpp
+++ b/libc/test/src/math/smoke/nearbyintl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nearbyintl.h"
 
-LIST_NEARBYINT_TESTS(long double, LIBC_NAMESPACE::nearbyintl)
+LIST_NEARBYINT_TESTS(Nearbyintl, long double, LIBC_NAMESPACE::nearbyintl)
diff --git a/libc/test/src/math/smoke/nextafter_test.cpp b/libc/test/src/math/smoke/nextafter_test.cpp
index 998b19fb1dccd..21f8c7209057f 100644
--- a/libc/test/src/math/smoke/nextafter_test.cpp
+++ b/libc/test/src/math/smoke/nextafter_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafter.h"
 
-LIST_NEXTAFTER_TESTS(double, LIBC_NAMESPACE::nextafter)
+LIST_NEXTAFTER_TESTS(Nextafter, double, LIBC_NAMESPACE::nextafter)
diff --git a/libc/test/src/math/smoke/nextafterbf16_test.cpp b/libc/test/src/math/smoke/nextafterbf16_test.cpp
index b73a3cbef0b74..f3406e7aa5a49 100644
--- a/libc/test/src/math/smoke/nextafterbf16_test.cpp
+++ b/libc/test/src/math/smoke/nextafterbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nextafterbf16.h"
 
-LIST_NEXTAFTER_TESTS(bfloat16, LIBC_NAMESPACE::nextafterbf16)
+LIST_NEXTAFTER_TESTS(Nextafterbf16, bfloat16, LIBC_NAMESPACE::nextafterbf16)
diff --git a/libc/test/src/math/smoke/nextafterf128_test.cpp b/libc/test/src/math/smoke/nextafterf128_test.cpp
index a8d000ff4de38..efe2e8b4d5269 100644
--- a/libc/test/src/math/smoke/nextafterf128_test.cpp
+++ b/libc/test/src/math/smoke/nextafterf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterf128.h"
 
-LIST_NEXTAFTER_TESTS(float128, LIBC_NAMESPACE::nextafterf128)
+LIST_NEXTAFTER_TESTS(Nextafterf128, float128, LIBC_NAMESPACE::nextafterf128)
diff --git a/libc/test/src/math/smoke/nextafterf16_test.cpp b/libc/test/src/math/smoke/nextafterf16_test.cpp
index 860a0c74acbca..49a3eca338ae5 100644
--- a/libc/test/src/math/smoke/nextafterf16_test.cpp
+++ b/libc/test/src/math/smoke/nextafterf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterf16.h"
 
-LIST_NEXTAFTER_TESTS(float16, LIBC_NAMESPACE::nextafterf16)
+LIST_NEXTAFTER_TESTS(Nextafterf16, float16, LIBC_NAMESPACE::nextafterf16)
diff --git a/libc/test/src/math/smoke/nextafterf_test.cpp b/libc/test/src/math/smoke/nextafterf_test.cpp
index 31770bc591ec1..99a65b559db78 100644
--- a/libc/test/src/math/smoke/nextafterf_test.cpp
+++ b/libc/test/src/math/smoke/nextafterf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterf.h"
 
-LIST_NEXTAFTER_TESTS(float, LIBC_NAMESPACE::nextafterf)
+LIST_NEXTAFTER_TESTS(Nextafterf, float, LIBC_NAMESPACE::nextafterf)
diff --git a/libc/test/src/math/smoke/nextafterl_test.cpp b/libc/test/src/math/smoke/nextafterl_test.cpp
index 4c8577f2690a1..2d750c947f726 100644
--- a/libc/test/src/math/smoke/nextafterl_test.cpp
+++ b/libc/test/src/math/smoke/nextafterl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextafterl.h"
 
-LIST_NEXTAFTER_TESTS(long double, LIBC_NAMESPACE::nextafterl)
+LIST_NEXTAFTER_TESTS(Nextafterl, long double, LIBC_NAMESPACE::nextafterl)
diff --git a/libc/test/src/math/smoke/nextdown_test.cpp b/libc/test/src/math/smoke/nextdown_test.cpp
index 6b0f5c6c5a6aa..8812f1057e9f3 100644
--- a/libc/test/src/math/smoke/nextdown_test.cpp
+++ b/libc/test/src/math/smoke/nextdown_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextdown.h"
 
-LIST_NEXTDOWN_TESTS(double, LIBC_NAMESPACE::nextdown)
+LIST_NEXTDOWN_TESTS(Nextdown, double, LIBC_NAMESPACE::nextdown)
diff --git a/libc/test/src/math/smoke/nextdownbf16_test.cpp b/libc/test/src/math/smoke/nextdownbf16_test.cpp
index 300206461e2de..8ac4a7a050fd3 100644
--- a/libc/test/src/math/smoke/nextdownbf16_test.cpp
+++ b/libc/test/src/math/smoke/nextdownbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nextdownbf16.h"
 
-LIST_NEXTDOWN_TESTS(bfloat16, LIBC_NAMESPACE::nextdownbf16)
+LIST_NEXTDOWN_TESTS(Nextdownbf16, bfloat16, LIBC_NAMESPACE::nextdownbf16)
diff --git a/libc/test/src/math/smoke/nextdownf128_test.cpp b/libc/test/src/math/smoke/nextdownf128_test.cpp
index 932a8b36a59e4..77b67f8ac8b6e 100644
--- a/libc/test/src/math/smoke/nextdownf128_test.cpp
+++ b/libc/test/src/math/smoke/nextdownf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextdownf128.h"
 
-LIST_NEXTDOWN_TESTS(float128, LIBC_NAMESPACE::nextdownf128)
+LIST_NEXTDOWN_TESTS(Nextdownf128, float128, LIBC_NAMESPACE::nextdownf128)
diff --git a/libc/test/src/math/smoke/nextdownf16_test.cpp b/libc/test/src/math/smoke/nextdownf16_test.cpp
index 353f085861778..afe297202c6fc 100644
--- a/libc/test/src/math/smoke/nextdownf16_test.cpp
+++ b/libc/test/src/math/smoke/nextdownf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextdownf16.h"
 
-LIST_NEXTDOWN_TESTS(float16, LIBC_NAMESPACE::nextdownf16)
+LIST_NEXTDOWN_TESTS(Nextdownf16, float16, LIBC_NAMESPACE::nextdownf16)
diff --git a/libc/test/src/math/smoke/nextdownf_test.cpp b/libc/test/src/math/smoke/nextdownf_test.cpp
index 3c05c22d82049..ccfcd96340cd7 100644
--- a/libc/test/src/math/smoke/nextdownf_test.cpp
+++ b/libc/test/src/math/smoke/nextdownf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextdownf.h"
 
-LIST_NEXTDOWN_TESTS(float, LIBC_NAMESPACE::nextdownf)
+LIST_NEXTDOWN_TESTS(Nextdownf, float, LIBC_NAMESPACE::nextdownf)
diff --git a/libc/test/src/math/smoke/nextdownl_test.cpp b/libc/test/src/math/smoke/nextdownl_test.cpp
index f1785eb58ce51..4b917e9939983 100644
--- a/libc/test/src/math/smoke/nextdownl_test.cpp
+++ b/libc/test/src/math/smoke/nextdownl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextdownl.h"
 
-LIST_NEXTDOWN_TESTS(long double, LIBC_NAMESPACE::nextdownl)
+LIST_NEXTDOWN_TESTS(Nextdownl, long double, LIBC_NAMESPACE::nextdownl)
diff --git a/libc/test/src/math/smoke/nexttoward_test.cpp b/libc/test/src/math/smoke/nexttoward_test.cpp
index 774c79efd747a..c7f1544ce0d36 100644
--- a/libc/test/src/math/smoke/nexttoward_test.cpp
+++ b/libc/test/src/math/smoke/nexttoward_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nexttoward.h"
 
-LIST_NEXTTOWARD_TESTS(double, LIBC_NAMESPACE::nexttoward)
+LIST_NEXTTOWARD_TESTS(Nexttoward, double, LIBC_NAMESPACE::nexttoward)
diff --git a/libc/test/src/math/smoke/nexttowardbf16_test.cpp b/libc/test/src/math/smoke/nexttowardbf16_test.cpp
index c1f35fcb96ef6..10f2ea8941458 100644
--- a/libc/test/src/math/smoke/nexttowardbf16_test.cpp
+++ b/libc/test/src/math/smoke/nexttowardbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nexttowardbf16.h"
 
-LIST_NEXTTOWARD_TESTS(bfloat16, LIBC_NAMESPACE::nexttowardbf16)
+LIST_NEXTTOWARD_TESTS(Nexttowardbf16, bfloat16, LIBC_NAMESPACE::nexttowardbf16)
diff --git a/libc/test/src/math/smoke/nexttowardf16_test.cpp b/libc/test/src/math/smoke/nexttowardf16_test.cpp
index 8490e8de94cee..2f145016914b0 100644
--- a/libc/test/src/math/smoke/nexttowardf16_test.cpp
+++ b/libc/test/src/math/smoke/nexttowardf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nexttowardf16.h"
 
-LIST_NEXTTOWARD_TESTS(float16, LIBC_NAMESPACE::nexttowardf16)
+LIST_NEXTTOWARD_TESTS(Nexttowardf16, float16, LIBC_NAMESPACE::nexttowardf16)
diff --git a/libc/test/src/math/smoke/nexttowardf_test.cpp b/libc/test/src/math/smoke/nexttowardf_test.cpp
index cb6c5f9ab15f5..163a78086980c 100644
--- a/libc/test/src/math/smoke/nexttowardf_test.cpp
+++ b/libc/test/src/math/smoke/nexttowardf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nexttowardf.h"
 
-LIST_NEXTTOWARD_TESTS(float, LIBC_NAMESPACE::nexttowardf)
+LIST_NEXTTOWARD_TESTS(Nexttowardf, float, LIBC_NAMESPACE::nexttowardf)
diff --git a/libc/test/src/math/smoke/nexttowardl_test.cpp b/libc/test/src/math/smoke/nexttowardl_test.cpp
index b3ee4f7887027..6f09f6560b572 100644
--- a/libc/test/src/math/smoke/nexttowardl_test.cpp
+++ b/libc/test/src/math/smoke/nexttowardl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nexttowardl.h"
 
-LIST_NEXTTOWARD_TESTS(long double, LIBC_NAMESPACE::nexttowardl)
+LIST_NEXTTOWARD_TESTS(Nexttowardl, long double, LIBC_NAMESPACE::nexttowardl)
diff --git a/libc/test/src/math/smoke/nextup_test.cpp b/libc/test/src/math/smoke/nextup_test.cpp
index 04c73ac9492f3..869cb6bce3a14 100644
--- a/libc/test/src/math/smoke/nextup_test.cpp
+++ b/libc/test/src/math/smoke/nextup_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextup.h"
 
-LIST_NEXTUP_TESTS(double, LIBC_NAMESPACE::nextup)
+LIST_NEXTUP_TESTS(Nextup, double, LIBC_NAMESPACE::nextup)
diff --git a/libc/test/src/math/smoke/nextupbf16_test.cpp b/libc/test/src/math/smoke/nextupbf16_test.cpp
index 49ad2f70b12a8..7038ee7cd04fe 100644
--- a/libc/test/src/math/smoke/nextupbf16_test.cpp
+++ b/libc/test/src/math/smoke/nextupbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/nextupbf16.h"
 
-LIST_NEXTUP_TESTS(bfloat16, LIBC_NAMESPACE::nextupbf16)
+LIST_NEXTUP_TESTS(Nextupbf16, bfloat16, LIBC_NAMESPACE::nextupbf16)
diff --git a/libc/test/src/math/smoke/nextupf128_test.cpp b/libc/test/src/math/smoke/nextupf128_test.cpp
index ddd385a7b159b..cc55d26d5303d 100644
--- a/libc/test/src/math/smoke/nextupf128_test.cpp
+++ b/libc/test/src/math/smoke/nextupf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextupf128.h"
 
-LIST_NEXTUP_TESTS(float128, LIBC_NAMESPACE::nextupf128)
+LIST_NEXTUP_TESTS(Nextupf128, float128, LIBC_NAMESPACE::nextupf128)
diff --git a/libc/test/src/math/smoke/nextupf16_test.cpp b/libc/test/src/math/smoke/nextupf16_test.cpp
index a146d279f3a71..06117d589c754 100644
--- a/libc/test/src/math/smoke/nextupf16_test.cpp
+++ b/libc/test/src/math/smoke/nextupf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextupf16.h"
 
-LIST_NEXTUP_TESTS(float16, LIBC_NAMESPACE::nextupf16)
+LIST_NEXTUP_TESTS(Nextupf16, float16, LIBC_NAMESPACE::nextupf16)
diff --git a/libc/test/src/math/smoke/nextupf_test.cpp b/libc/test/src/math/smoke/nextupf_test.cpp
index df73bee011711..f2183ecb9f33e 100644
--- a/libc/test/src/math/smoke/nextupf_test.cpp
+++ b/libc/test/src/math/smoke/nextupf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextupf.h"
 
-LIST_NEXTUP_TESTS(float, LIBC_NAMESPACE::nextupf)
+LIST_NEXTUP_TESTS(Nextupf, float, LIBC_NAMESPACE::nextupf)
diff --git a/libc/test/src/math/smoke/nextupl_test.cpp b/libc/test/src/math/smoke/nextupl_test.cpp
index 50f765633c2a5..77a340eef1d5e 100644
--- a/libc/test/src/math/smoke/nextupl_test.cpp
+++ b/libc/test/src/math/smoke/nextupl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/nextupl.h"
 
-LIST_NEXTUP_TESTS(long double, LIBC_NAMESPACE::nextupl)
+LIST_NEXTUP_TESTS(Nextupl, long double, LIBC_NAMESPACE::nextupl)
diff --git a/libc/test/src/math/smoke/remquo_test.cpp b/libc/test/src/math/smoke/remquo_test.cpp
index 4358331a8f76e..0747fc9cae5ab 100644
--- a/libc/test/src/math/smoke/remquo_test.cpp
+++ b/libc/test/src/math/smoke/remquo_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquo.h"
 
-LIST_REMQUO_TESTS(double, LIBC_NAMESPACE::remquo)
+LIST_REMQUO_TESTS(Remquo, double, LIBC_NAMESPACE::remquo)
diff --git a/libc/test/src/math/smoke/remquobf16_test.cpp b/libc/test/src/math/smoke/remquobf16_test.cpp
index 3f754bbd28a41..f095256813673 100644
--- a/libc/test/src/math/smoke/remquobf16_test.cpp
+++ b/libc/test/src/math/smoke/remquobf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/remquobf16.h"
 
-LIST_REMQUO_TESTS(bfloat16, LIBC_NAMESPACE::remquobf16)
+LIST_REMQUO_TESTS(Remquobf16, bfloat16, LIBC_NAMESPACE::remquobf16)
diff --git a/libc/test/src/math/smoke/remquof128_test.cpp b/libc/test/src/math/smoke/remquof128_test.cpp
index 8ef6c3b31cef2..1beded84679d7 100644
--- a/libc/test/src/math/smoke/remquof128_test.cpp
+++ b/libc/test/src/math/smoke/remquof128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquof128.h"
 
-LIST_REMQUO_TESTS(float128, LIBC_NAMESPACE::remquof128)
+LIST_REMQUO_TESTS(Remquof128, float128, LIBC_NAMESPACE::remquof128)
diff --git a/libc/test/src/math/smoke/remquof16_test.cpp b/libc/test/src/math/smoke/remquof16_test.cpp
index 18f2aba71aabe..c61f2ab6967c8 100644
--- a/libc/test/src/math/smoke/remquof16_test.cpp
+++ b/libc/test/src/math/smoke/remquof16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquof16.h"
 
-LIST_REMQUO_TESTS(float16, LIBC_NAMESPACE::remquof16)
+LIST_REMQUO_TESTS(Remquof16, float16, LIBC_NAMESPACE::remquof16)
diff --git a/libc/test/src/math/smoke/remquof_test.cpp b/libc/test/src/math/smoke/remquof_test.cpp
index 590b4ffb4595f..b5bd41e240f10 100644
--- a/libc/test/src/math/smoke/remquof_test.cpp
+++ b/libc/test/src/math/smoke/remquof_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquof.h"
 
-LIST_REMQUO_TESTS(float, LIBC_NAMESPACE::remquof)
+LIST_REMQUO_TESTS(Remquof, float, LIBC_NAMESPACE::remquof)
diff --git a/libc/test/src/math/smoke/remquol_test.cpp b/libc/test/src/math/smoke/remquol_test.cpp
index ae2db44930410..9da70f2309f8e 100644
--- a/libc/test/src/math/smoke/remquol_test.cpp
+++ b/libc/test/src/math/smoke/remquol_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/remquol.h"
 
-LIST_REMQUO_TESTS(long double, LIBC_NAMESPACE::remquol)
+LIST_REMQUO_TESTS(Remquol, long double, LIBC_NAMESPACE::remquol)
diff --git a/libc/test/src/math/smoke/rint_test.cpp b/libc/test/src/math/smoke/rint_test.cpp
index 9c89b7acec56d..5da6398511b0c 100644
--- a/libc/test/src/math/smoke/rint_test.cpp
+++ b/libc/test/src/math/smoke/rint_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rint.h"
 
-LIST_RINT_TESTS(double, LIBC_NAMESPACE::rint)
+LIST_RINT_TESTS(Rint, double, LIBC_NAMESPACE::rint)
diff --git a/libc/test/src/math/smoke/rintbf16_test.cpp b/libc/test/src/math/smoke/rintbf16_test.cpp
index c78dcf6a31560..60e76777c8d39 100644
--- a/libc/test/src/math/smoke/rintbf16_test.cpp
+++ b/libc/test/src/math/smoke/rintbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/rintbf16.h"
 
-LIST_RINT_TESTS(bfloat16, LIBC_NAMESPACE::rintbf16)
+LIST_RINT_TESTS(Rintbf16, bfloat16, LIBC_NAMESPACE::rintbf16)
diff --git a/libc/test/src/math/smoke/rintf128_test.cpp b/libc/test/src/math/smoke/rintf128_test.cpp
index cd537936b69a4..35ed19b38e588 100644
--- a/libc/test/src/math/smoke/rintf128_test.cpp
+++ b/libc/test/src/math/smoke/rintf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_RINT_TESTS(float128, LIBC_NAMESPACE::rintf128)
+LIST_RINT_TESTS(Rintf128, float128, LIBC_NAMESPACE::rintf128)
diff --git a/libc/test/src/math/smoke/rintf16_test.cpp b/libc/test/src/math/smoke/rintf16_test.cpp
index 2adf2560bae1f..d8922a27383fd 100644
--- a/libc/test/src/math/smoke/rintf16_test.cpp
+++ b/libc/test/src/math/smoke/rintf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintf16.h"
 
-LIST_RINT_TESTS(float16, LIBC_NAMESPACE::rintf16)
+LIST_RINT_TESTS(Rintf16, float16, LIBC_NAMESPACE::rintf16)
diff --git a/libc/test/src/math/smoke/rintf_test.cpp b/libc/test/src/math/smoke/rintf_test.cpp
index f875bab2556ca..e40006780874f 100644
--- a/libc/test/src/math/smoke/rintf_test.cpp
+++ b/libc/test/src/math/smoke/rintf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintf.h"
 
-LIST_RINT_TESTS(float, LIBC_NAMESPACE::rintf)
+LIST_RINT_TESTS(Rintf, float, LIBC_NAMESPACE::rintf)
diff --git a/libc/test/src/math/smoke/rintl_test.cpp b/libc/test/src/math/smoke/rintl_test.cpp
index 458ca05a985af..dd04f008db7f8 100644
--- a/libc/test/src/math/smoke/rintl_test.cpp
+++ b/libc/test/src/math/smoke/rintl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/rintl.h"
 
-LIST_RINT_TESTS(long double, LIBC_NAMESPACE::rintl)
+LIST_RINT_TESTS(Rintl, long double, LIBC_NAMESPACE::rintl)
diff --git a/libc/test/src/math/smoke/round_test.cpp b/libc/test/src/math/smoke/round_test.cpp
index dbcb56717e208..5855efb28f494 100644
--- a/libc/test/src/math/smoke/round_test.cpp
+++ b/libc/test/src/math/smoke/round_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/round.h"
 
-LIST_ROUND_TESTS(double, LIBC_NAMESPACE::round)
+LIST_ROUND_TESTS(Round, double, LIBC_NAMESPACE::round)
diff --git a/libc/test/src/math/smoke/roundbf16_test.cpp b/libc/test/src/math/smoke/roundbf16_test.cpp
index 51638689e8092..35413c0dc3de3 100644
--- a/libc/test/src/math/smoke/roundbf16_test.cpp
+++ b/libc/test/src/math/smoke/roundbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/roundbf16.h"
 
-LIST_ROUND_TESTS(bfloat16, LIBC_NAMESPACE::roundbf16)
+LIST_ROUND_TESTS(Roundbf16, bfloat16, LIBC_NAMESPACE::roundbf16)
diff --git a/libc/test/src/math/smoke/roundeven_test.cpp b/libc/test/src/math/smoke/roundeven_test.cpp
index e2d625fb0d315..979d2301aab65 100644
--- a/libc/test/src/math/smoke/roundeven_test.cpp
+++ b/libc/test/src/math/smoke/roundeven_test.cpp
@@ -9,4 +9,4 @@
 #include "RoundEvenTest.h"
 #include "src/math/roundeven.h"
 
-LIST_ROUNDEVEN_TESTS(double, LIBC_NAMESPACE::roundeven)
+LIST_ROUNDEVEN_TESTS(Roundeven, double, LIBC_NAMESPACE::roundeven)
diff --git a/libc/test/src/math/smoke/roundevenbf16_test.cpp b/libc/test/src/math/smoke/roundevenbf16_test.cpp
index 711c37a4e5115..494c7e39fecf5 100644
--- a/libc/test/src/math/smoke/roundevenbf16_test.cpp
+++ b/libc/test/src/math/smoke/roundevenbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/roundevenbf16.h"
 
-LIST_ROUNDEVEN_TESTS(bfloat16, LIBC_NAMESPACE::roundevenbf16)
+LIST_ROUNDEVEN_TESTS(Roundevenbf16, bfloat16, LIBC_NAMESPACE::roundevenbf16)
diff --git a/libc/test/src/math/smoke/roundevenf128_test.cpp b/libc/test/src/math/smoke/roundevenf128_test.cpp
index 190f091ed1eef..b013fd9b4116e 100644
--- a/libc/test/src/math/smoke/roundevenf128_test.cpp
+++ b/libc/test/src/math/smoke/roundevenf128_test.cpp
@@ -14,4 +14,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUNDEVEN_TESTS(float128, LIBC_NAMESPACE::roundevenf128)
+LIST_ROUNDEVEN_TESTS(Roundevenf128, float128, LIBC_NAMESPACE::roundevenf128)
diff --git a/libc/test/src/math/smoke/roundevenf16_test.cpp b/libc/test/src/math/smoke/roundevenf16_test.cpp
index 911a32c9f73f4..d70f5f4d8c26c 100644
--- a/libc/test/src/math/smoke/roundevenf16_test.cpp
+++ b/libc/test/src/math/smoke/roundevenf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundevenf16.h"
 
-LIST_ROUNDEVEN_TESTS(float16, LIBC_NAMESPACE::roundevenf16)
+LIST_ROUNDEVEN_TESTS(Roundevenf16, float16, LIBC_NAMESPACE::roundevenf16)
diff --git a/libc/test/src/math/smoke/roundevenf_test.cpp b/libc/test/src/math/smoke/roundevenf_test.cpp
index f033e26988fab..b99fee56bdf34 100644
--- a/libc/test/src/math/smoke/roundevenf_test.cpp
+++ b/libc/test/src/math/smoke/roundevenf_test.cpp
@@ -9,4 +9,4 @@
 #include "RoundEvenTest.h"
 #include "src/math/roundevenf.h"
 
-LIST_ROUNDEVEN_TESTS(float, LIBC_NAMESPACE::roundevenf)
+LIST_ROUNDEVEN_TESTS(Roundevenf, float, LIBC_NAMESPACE::roundevenf)
diff --git a/libc/test/src/math/smoke/roundevenl_test.cpp b/libc/test/src/math/smoke/roundevenl_test.cpp
index be09f1283aa70..df1565cf78e73 100644
--- a/libc/test/src/math/smoke/roundevenl_test.cpp
+++ b/libc/test/src/math/smoke/roundevenl_test.cpp
@@ -9,4 +9,4 @@
 #include "RoundEvenTest.h"
 #include "src/math/roundevenl.h"
 
-LIST_ROUNDEVEN_TESTS(long double, LIBC_NAMESPACE::roundevenl)
+LIST_ROUNDEVEN_TESTS(Roundevenl, long double, LIBC_NAMESPACE::roundevenl)
diff --git a/libc/test/src/math/smoke/roundf128_test.cpp b/libc/test/src/math/smoke/roundf128_test.cpp
index c1e1a497a7d50..2a851b287eb82 100644
--- a/libc/test/src/math/smoke/roundf128_test.cpp
+++ b/libc/test/src/math/smoke/roundf128_test.cpp
@@ -14,4 +14,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_ROUND_TESTS(float128, LIBC_NAMESPACE::roundf128)
+LIST_ROUND_TESTS(Roundf128, float128, LIBC_NAMESPACE::roundf128)
diff --git a/libc/test/src/math/smoke/roundf16_test.cpp b/libc/test/src/math/smoke/roundf16_test.cpp
index 54ead855934db..ceca7be084f43 100644
--- a/libc/test/src/math/smoke/roundf16_test.cpp
+++ b/libc/test/src/math/smoke/roundf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundf16.h"
 
-LIST_ROUND_TESTS(float16, LIBC_NAMESPACE::roundf16)
+LIST_ROUND_TESTS(Roundf16, float16, LIBC_NAMESPACE::roundf16)
diff --git a/libc/test/src/math/smoke/roundf_test.cpp b/libc/test/src/math/smoke/roundf_test.cpp
index 053596a16e22f..026b322a8d4c7 100644
--- a/libc/test/src/math/smoke/roundf_test.cpp
+++ b/libc/test/src/math/smoke/roundf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundf.h"
 
-LIST_ROUND_TESTS(float, LIBC_NAMESPACE::roundf)
+LIST_ROUND_TESTS(Roundf, float, LIBC_NAMESPACE::roundf)
diff --git a/libc/test/src/math/smoke/roundl_test.cpp b/libc/test/src/math/smoke/roundl_test.cpp
index 2a2a213a8181c..f323b2ecce15e 100644
--- a/libc/test/src/math/smoke/roundl_test.cpp
+++ b/libc/test/src/math/smoke/roundl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/roundl.h"
 
-LIST_ROUND_TESTS(long double, LIBC_NAMESPACE::roundl)
+LIST_ROUND_TESTS(Roundl, long double, LIBC_NAMESPACE::roundl)
diff --git a/libc/test/src/math/smoke/scalbln_test.cpp b/libc/test/src/math/smoke/scalbln_test.cpp
index eaf7b8e47b41c..f5198923fb9fb 100644
--- a/libc/test/src/math/smoke/scalbln_test.cpp
+++ b/libc/test/src/math/smoke/scalbln_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbln.h"
 
-LIST_SCALBN_TESTS(double, long, LIBC_NAMESPACE::scalbln)
+LIST_SCALBN_TESTS(Scalbln, double, long, LIBC_NAMESPACE::scalbln)
diff --git a/libc/test/src/math/smoke/scalblnbf16_test.cpp b/libc/test/src/math/smoke/scalblnbf16_test.cpp
index c6fc3aac5e744..34913ccde68fa 100644
--- a/libc/test/src/math/smoke/scalblnbf16_test.cpp
+++ b/libc/test/src/math/smoke/scalblnbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/scalblnbf16.h"
 
-LIST_SCALBN_TESTS(bfloat16, long, LIBC_NAMESPACE::scalblnbf16)
+LIST_SCALBN_TESTS(Scalblnbf16, bfloat16, long, LIBC_NAMESPACE::scalblnbf16)
diff --git a/libc/test/src/math/smoke/scalblnf128_test.cpp b/libc/test/src/math/smoke/scalblnf128_test.cpp
index 9ee1b3816511e..317d32f670775 100644
--- a/libc/test/src/math/smoke/scalblnf128_test.cpp
+++ b/libc/test/src/math/smoke/scalblnf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalblnf128.h"
 
-LIST_SCALBN_TESTS(float128, long, LIBC_NAMESPACE::scalblnf128)
+LIST_SCALBN_TESTS(Scalblnf128, float128, long, LIBC_NAMESPACE::scalblnf128)
diff --git a/libc/test/src/math/smoke/scalblnf16_test.cpp b/libc/test/src/math/smoke/scalblnf16_test.cpp
index a678254292901..38f27bee26e86 100644
--- a/libc/test/src/math/smoke/scalblnf16_test.cpp
+++ b/libc/test/src/math/smoke/scalblnf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalblnf16.h"
 
-LIST_SCALBN_TESTS(float16, long, LIBC_NAMESPACE::scalblnf16)
+LIST_SCALBN_TESTS(Scalblnf16, float16, long, LIBC_NAMESPACE::scalblnf16)
diff --git a/libc/test/src/math/smoke/scalblnf_test.cpp b/libc/test/src/math/smoke/scalblnf_test.cpp
index a40d7aa7886db..a501dbb56bd4c 100644
--- a/libc/test/src/math/smoke/scalblnf_test.cpp
+++ b/libc/test/src/math/smoke/scalblnf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalblnf.h"
 
-LIST_SCALBN_TESTS(float, long, LIBC_NAMESPACE::scalblnf)
+LIST_SCALBN_TESTS(Scalblnf, float, long, LIBC_NAMESPACE::scalblnf)
diff --git a/libc/test/src/math/smoke/scalblnl_test.cpp b/libc/test/src/math/smoke/scalblnl_test.cpp
index ccfbe1ebdeaf0..a769023b3cd0a 100644
--- a/libc/test/src/math/smoke/scalblnl_test.cpp
+++ b/libc/test/src/math/smoke/scalblnl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalblnl.h"
 
-LIST_SCALBN_TESTS(long double, long, LIBC_NAMESPACE::scalblnl)
+LIST_SCALBN_TESTS(Scalblnl, long double, long, LIBC_NAMESPACE::scalblnl)
diff --git a/libc/test/src/math/smoke/scalbn_test.cpp b/libc/test/src/math/smoke/scalbn_test.cpp
index 86ad71b01c2bb..1502d64cbf43e 100644
--- a/libc/test/src/math/smoke/scalbn_test.cpp
+++ b/libc/test/src/math/smoke/scalbn_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbn.h"
 
-LIST_SCALBN_TESTS(double, int, LIBC_NAMESPACE::scalbn)
+LIST_SCALBN_TESTS(Scalbn, double, int, LIBC_NAMESPACE::scalbn)
diff --git a/libc/test/src/math/smoke/scalbnbf16_test.cpp b/libc/test/src/math/smoke/scalbnbf16_test.cpp
index 855fd75e6e8f9..22be66f539d0a 100644
--- a/libc/test/src/math/smoke/scalbnbf16_test.cpp
+++ b/libc/test/src/math/smoke/scalbnbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/scalbnbf16.h"
 
-LIST_SCALBN_TESTS(bfloat16, int, LIBC_NAMESPACE::scalbnbf16)
+LIST_SCALBN_TESTS(Scalbnbf16, bfloat16, int, LIBC_NAMESPACE::scalbnbf16)
diff --git a/libc/test/src/math/smoke/scalbnf128_test.cpp b/libc/test/src/math/smoke/scalbnf128_test.cpp
index b42902a76a228..53942c3d8b1f6 100644
--- a/libc/test/src/math/smoke/scalbnf128_test.cpp
+++ b/libc/test/src/math/smoke/scalbnf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnf128.h"
 
-LIST_SCALBN_TESTS(float128, int, LIBC_NAMESPACE::scalbnf128)
+LIST_SCALBN_TESTS(Scalbnf128, float128, int, LIBC_NAMESPACE::scalbnf128)
diff --git a/libc/test/src/math/smoke/scalbnf16_test.cpp b/libc/test/src/math/smoke/scalbnf16_test.cpp
index 9cee0d04780e5..1e751f1c8b801 100644
--- a/libc/test/src/math/smoke/scalbnf16_test.cpp
+++ b/libc/test/src/math/smoke/scalbnf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnf16.h"
 
-LIST_SCALBN_TESTS(float16, int, LIBC_NAMESPACE::scalbnf16)
+LIST_SCALBN_TESTS(Scalbnf16, float16, int, LIBC_NAMESPACE::scalbnf16)
diff --git a/libc/test/src/math/smoke/scalbnf_test.cpp b/libc/test/src/math/smoke/scalbnf_test.cpp
index b25db4e8175e9..200c1234f1ebe 100644
--- a/libc/test/src/math/smoke/scalbnf_test.cpp
+++ b/libc/test/src/math/smoke/scalbnf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnf.h"
 
-LIST_SCALBN_TESTS(float, int, LIBC_NAMESPACE::scalbnf)
+LIST_SCALBN_TESTS(Scalbnf, float, int, LIBC_NAMESPACE::scalbnf)
diff --git a/libc/test/src/math/smoke/scalbnl_test.cpp b/libc/test/src/math/smoke/scalbnl_test.cpp
index 838b0650c5ad9..6a3eb7317fcc0 100644
--- a/libc/test/src/math/smoke/scalbnl_test.cpp
+++ b/libc/test/src/math/smoke/scalbnl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/scalbnl.h"
 
-LIST_SCALBN_TESTS(long double, int, LIBC_NAMESPACE::scalbnl)
+LIST_SCALBN_TESTS(Scalbnl, long double, int, LIBC_NAMESPACE::scalbnl)
diff --git a/libc/test/src/math/smoke/setpayload_test.cpp b/libc/test/src/math/smoke/setpayload_test.cpp
index e41b3f86c5f17..d962724ebd259 100644
--- a/libc/test/src/math/smoke/setpayload_test.cpp
+++ b/libc/test/src/math/smoke/setpayload_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayload.h"
 
-LIST_SETPAYLOAD_TESTS(double, LIBC_NAMESPACE::setpayload)
+LIST_SETPAYLOAD_TESTS(Setpayload, double, LIBC_NAMESPACE::setpayload)
diff --git a/libc/test/src/math/smoke/setpayloadbf16_test.cpp b/libc/test/src/math/smoke/setpayloadbf16_test.cpp
index 198b454ed78b0..b6d73d6881a5f 100644
--- a/libc/test/src/math/smoke/setpayloadbf16_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/setpayloadbf16.h"
 
-LIST_SETPAYLOAD_TESTS(bfloat16, LIBC_NAMESPACE::setpayloadbf16)
+LIST_SETPAYLOAD_TESTS(Setpayloadbf16, bfloat16, LIBC_NAMESPACE::setpayloadbf16)
diff --git a/libc/test/src/math/smoke/setpayloadf128_test.cpp b/libc/test/src/math/smoke/setpayloadf128_test.cpp
index 4b17bfee093c0..3e386972980e1 100644
--- a/libc/test/src/math/smoke/setpayloadf128_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadf128.h"
 
-LIST_SETPAYLOAD_TESTS(float128, LIBC_NAMESPACE::setpayloadf128)
+LIST_SETPAYLOAD_TESTS(Setpayloadf128, float128, LIBC_NAMESPACE::setpayloadf128)
diff --git a/libc/test/src/math/smoke/setpayloadf16_test.cpp b/libc/test/src/math/smoke/setpayloadf16_test.cpp
index ccf5370272345..9aaa383d7bd20 100644
--- a/libc/test/src/math/smoke/setpayloadf16_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadf16.h"
 
-LIST_SETPAYLOAD_TESTS(float16, LIBC_NAMESPACE::setpayloadf16)
+LIST_SETPAYLOAD_TESTS(Setpayloadf16, float16, LIBC_NAMESPACE::setpayloadf16)
diff --git a/libc/test/src/math/smoke/setpayloadf_test.cpp b/libc/test/src/math/smoke/setpayloadf_test.cpp
index 51e285f171843..7dd32c8c67d8d 100644
--- a/libc/test/src/math/smoke/setpayloadf_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadf.h"
 
-LIST_SETPAYLOAD_TESTS(float, LIBC_NAMESPACE::setpayloadf)
+LIST_SETPAYLOAD_TESTS(Setpayloadf, float, LIBC_NAMESPACE::setpayloadf)
diff --git a/libc/test/src/math/smoke/setpayloadl_test.cpp b/libc/test/src/math/smoke/setpayloadl_test.cpp
index 45bc6fd2bb9fd..b1eb668441826 100644
--- a/libc/test/src/math/smoke/setpayloadl_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadl.h"
 
-LIST_SETPAYLOAD_TESTS(long double, LIBC_NAMESPACE::setpayloadl)
+LIST_SETPAYLOAD_TESTS(Setpayloadl, long double, LIBC_NAMESPACE::setpayloadl)
diff --git a/libc/test/src/math/smoke/setpayloadsig_test.cpp b/libc/test/src/math/smoke/setpayloadsig_test.cpp
index 4a7dea73bbc8f..e7559da77d577 100644
--- a/libc/test/src/math/smoke/setpayloadsig_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsig_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadsig.h"
 
-LIST_SETPAYLOADSIG_TESTS(double, LIBC_NAMESPACE::setpayloadsig)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsig, double, LIBC_NAMESPACE::setpayloadsig)
diff --git a/libc/test/src/math/smoke/setpayloadsigbf16_test.cpp b/libc/test/src/math/smoke/setpayloadsigbf16_test.cpp
index aa6a3e9dcbf2f..3dcaa9b7476d8 100644
--- a/libc/test/src/math/smoke/setpayloadsigbf16_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsigbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/setpayloadsigbf16.h"
 
-LIST_SETPAYLOADSIG_TESTS(bfloat16, LIBC_NAMESPACE::setpayloadsigbf16)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsigbf16, bfloat16,
+                         LIBC_NAMESPACE::setpayloadsigbf16)
diff --git a/libc/test/src/math/smoke/setpayloadsigf128_test.cpp b/libc/test/src/math/smoke/setpayloadsigf128_test.cpp
index ea7d0268b3a29..90f2a2aef9569 100644
--- a/libc/test/src/math/smoke/setpayloadsigf128_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsigf128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/setpayloadsigf128.h"
 
-LIST_SETPAYLOADSIG_TESTS(float128, LIBC_NAMESPACE::setpayloadsigf128)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsigf128, float128,
+                         LIBC_NAMESPACE::setpayloadsigf128)
diff --git a/libc/test/src/math/smoke/setpayloadsigf16_test.cpp b/libc/test/src/math/smoke/setpayloadsigf16_test.cpp
index 9f786e636d086..62dd55b0a9216 100644
--- a/libc/test/src/math/smoke/setpayloadsigf16_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsigf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/setpayloadsigf16.h"
 
-LIST_SETPAYLOADSIG_TESTS(float16, LIBC_NAMESPACE::setpayloadsigf16)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsigf16, float16,
+                         LIBC_NAMESPACE::setpayloadsigf16)
diff --git a/libc/test/src/math/smoke/setpayloadsigf_test.cpp b/libc/test/src/math/smoke/setpayloadsigf_test.cpp
index dd8ca2fe86ece..13bb42605c466 100644
--- a/libc/test/src/math/smoke/setpayloadsigf_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsigf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/setpayloadsigf.h"
 
-LIST_SETPAYLOADSIG_TESTS(float, LIBC_NAMESPACE::setpayloadsigf)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsigf, float, LIBC_NAMESPACE::setpayloadsigf)
diff --git a/libc/test/src/math/smoke/setpayloadsigl_test.cpp b/libc/test/src/math/smoke/setpayloadsigl_test.cpp
index 6fc878c3f18a4..ee04ae97e2973 100644
--- a/libc/test/src/math/smoke/setpayloadsigl_test.cpp
+++ b/libc/test/src/math/smoke/setpayloadsigl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/setpayloadsigl.h"
 
-LIST_SETPAYLOADSIG_TESTS(long double, LIBC_NAMESPACE::setpayloadsigl)
+LIST_SETPAYLOADSIG_TESTS(Setpayloadsigl, long double,
+                         LIBC_NAMESPACE::setpayloadsigl)
diff --git a/libc/test/src/math/smoke/sqrt_test.cpp b/libc/test/src/math/smoke/sqrt_test.cpp
index b41e06daf722e..aad5d46d44157 100644
--- a/libc/test/src/math/smoke/sqrt_test.cpp
+++ b/libc/test/src/math/smoke/sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrt.h"
 
-LIST_SQRT_TESTS(double, LIBC_NAMESPACE::sqrt);
+LIST_SQRT_TESTS(Sqrt, double, LIBC_NAMESPACE::sqrt);
diff --git a/libc/test/src/math/smoke/sqrtbf16_test.cpp b/libc/test/src/math/smoke/sqrtbf16_test.cpp
index 25629347fee3e..6a6cff36ddb57 100644
--- a/libc/test/src/math/smoke/sqrtbf16_test.cpp
+++ b/libc/test/src/math/smoke/sqrtbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/sqrtbf16.h"
 
-LIST_SQRT_TESTS(bfloat16, LIBC_NAMESPACE::sqrtbf16);
+LIST_SQRT_TESTS(Sqrtbf16, bfloat16, LIBC_NAMESPACE::sqrtbf16);
diff --git a/libc/test/src/math/smoke/sqrtf128_test.cpp b/libc/test/src/math/smoke/sqrtf128_test.cpp
index 646be121c903a..3ac1cee71fb61 100644
--- a/libc/test/src/math/smoke/sqrtf128_test.cpp
+++ b/libc/test/src/math/smoke/sqrtf128_test.cpp
@@ -18,9 +18,9 @@ using float128 = LIBC_NAMESPACE::fputil::Float128;
 
 using LIBC_NAMESPACE::operator""_u128;
 
-LIST_SQRT_TESTS(float128, LIBC_NAMESPACE::sqrtf128);
+LIST_SQRT_TESTS(Sqrtf128, float128, LIBC_NAMESPACE::sqrtf128);
 
-TEST_F(LlvmLibcSqrtTest, HardToRound) {
+TEST_F(LlvmLibcSqrtf128Test, HardToRound) {
   using LIBC_NAMESPACE::fputil::testing::RoundingMode;
   using FPBits = LIBC_NAMESPACE::fputil::FPBits<float128>;
 
diff --git a/libc/test/src/math/smoke/sqrtf16_test.cpp b/libc/test/src/math/smoke/sqrtf16_test.cpp
index 950abd28840f0..2ddd4e6307848 100644
--- a/libc/test/src/math/smoke/sqrtf16_test.cpp
+++ b/libc/test/src/math/smoke/sqrtf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrtf16.h"
 
-LIST_SQRT_TESTS(float16, LIBC_NAMESPACE::sqrtf16);
+LIST_SQRT_TESTS(Sqrtf16, float16, LIBC_NAMESPACE::sqrtf16);
diff --git a/libc/test/src/math/smoke/sqrtf_test.cpp b/libc/test/src/math/smoke/sqrtf_test.cpp
index 888b6cbdd643c..cc70fb0d8db61 100644
--- a/libc/test/src/math/smoke/sqrtf_test.cpp
+++ b/libc/test/src/math/smoke/sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrtf.h"
 
-LIST_SQRT_TESTS(float, LIBC_NAMESPACE::sqrtf);
+LIST_SQRT_TESTS(Sqrtf, float, LIBC_NAMESPACE::sqrtf);
diff --git a/libc/test/src/math/smoke/sqrtl_test.cpp b/libc/test/src/math/smoke/sqrtl_test.cpp
index 4f4a64f81ab7f..c9762ce469f7e 100644
--- a/libc/test/src/math/smoke/sqrtl_test.cpp
+++ b/libc/test/src/math/smoke/sqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrtl.h"
 
-LIST_SQRT_TESTS(long double, LIBC_NAMESPACE::sqrtl);
+LIST_SQRT_TESTS(Sqrtl, long double, LIBC_NAMESPACE::sqrtl);
diff --git a/libc/test/src/math/smoke/totalorder_test.cpp b/libc/test/src/math/smoke/totalorder_test.cpp
index 21f49c31f50fe..0cdb01132f1d8 100644
--- a/libc/test/src/math/smoke/totalorder_test.cpp
+++ b/libc/test/src/math/smoke/totalorder_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalorder.h"
 
-LIST_TOTALORDER_TESTS(double, LIBC_NAMESPACE::totalorder)
+LIST_TOTALORDER_TESTS(Totalorder, double, LIBC_NAMESPACE::totalorder)
diff --git a/libc/test/src/math/smoke/totalorderbf16_test.cpp b/libc/test/src/math/smoke/totalorderbf16_test.cpp
index 11aeeac0c52dd..e25ca97d7518d 100644
--- a/libc/test/src/math/smoke/totalorderbf16_test.cpp
+++ b/libc/test/src/math/smoke/totalorderbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/totalorderbf16.h"
 
-LIST_TOTALORDER_TESTS(bfloat16, LIBC_NAMESPACE::totalorderbf16)
+LIST_TOTALORDER_TESTS(Totalorderbf16, bfloat16, LIBC_NAMESPACE::totalorderbf16)
diff --git a/libc/test/src/math/smoke/totalorderf128_test.cpp b/libc/test/src/math/smoke/totalorderf128_test.cpp
index 6f7fd6a94fcf9..3696b54114c5c 100644
--- a/libc/test/src/math/smoke/totalorderf128_test.cpp
+++ b/libc/test/src/math/smoke/totalorderf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalorderf128.h"
 
-LIST_TOTALORDER_TESTS(float128, LIBC_NAMESPACE::totalorderf128)
+LIST_TOTALORDER_TESTS(Totalorderf128, float128, LIBC_NAMESPACE::totalorderf128)
diff --git a/libc/test/src/math/smoke/totalorderf16_test.cpp b/libc/test/src/math/smoke/totalorderf16_test.cpp
index 410c70c47c51d..16a81e7e30a1c 100644
--- a/libc/test/src/math/smoke/totalorderf16_test.cpp
+++ b/libc/test/src/math/smoke/totalorderf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalorderf16.h"
 
-LIST_TOTALORDER_TESTS(float16, LIBC_NAMESPACE::totalorderf16)
+LIST_TOTALORDER_TESTS(Totalorderf16, float16, LIBC_NAMESPACE::totalorderf16)
diff --git a/libc/test/src/math/smoke/totalorderf_test.cpp b/libc/test/src/math/smoke/totalorderf_test.cpp
index 71db87c0c2415..5f2fda5815600 100644
--- a/libc/test/src/math/smoke/totalorderf_test.cpp
+++ b/libc/test/src/math/smoke/totalorderf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalorderf.h"
 
-LIST_TOTALORDER_TESTS(float, LIBC_NAMESPACE::totalorderf)
+LIST_TOTALORDER_TESTS(Totalorderf, float, LIBC_NAMESPACE::totalorderf)
diff --git a/libc/test/src/math/smoke/totalorderl_test.cpp b/libc/test/src/math/smoke/totalorderl_test.cpp
index fc2353fce3859..e6c194422edfc 100644
--- a/libc/test/src/math/smoke/totalorderl_test.cpp
+++ b/libc/test/src/math/smoke/totalorderl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalorderl.h"
 
-LIST_TOTALORDER_TESTS(long double, LIBC_NAMESPACE::totalorderl)
+LIST_TOTALORDER_TESTS(Totalorderl, long double, LIBC_NAMESPACE::totalorderl)
diff --git a/libc/test/src/math/smoke/totalordermag_test.cpp b/libc/test/src/math/smoke/totalordermag_test.cpp
index 6c3b6ddbd7422..c3c10df0b6c75 100644
--- a/libc/test/src/math/smoke/totalordermag_test.cpp
+++ b/libc/test/src/math/smoke/totalordermag_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalordermag.h"
 
-LIST_TOTALORDERMAG_TESTS(double, LIBC_NAMESPACE::totalordermag)
+LIST_TOTALORDERMAG_TESTS(Totalordermag, double, LIBC_NAMESPACE::totalordermag)
diff --git a/libc/test/src/math/smoke/totalordermagbf16_test.cpp b/libc/test/src/math/smoke/totalordermagbf16_test.cpp
index b5a5a1b7d6c52..c0ded3395e900 100644
--- a/libc/test/src/math/smoke/totalordermagbf16_test.cpp
+++ b/libc/test/src/math/smoke/totalordermagbf16_test.cpp
@@ -11,4 +11,5 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/totalordermagbf16.h"
 
-LIST_TOTALORDERMAG_TESTS(bfloat16, LIBC_NAMESPACE::totalordermagbf16)
+LIST_TOTALORDERMAG_TESTS(Totalordermagbf16, bfloat16,
+                         LIBC_NAMESPACE::totalordermagbf16)
diff --git a/libc/test/src/math/smoke/totalordermagf128_test.cpp b/libc/test/src/math/smoke/totalordermagf128_test.cpp
index 6cbe24ff8778f..613ed57fc2223 100644
--- a/libc/test/src/math/smoke/totalordermagf128_test.cpp
+++ b/libc/test/src/math/smoke/totalordermagf128_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/totalordermagf128.h"
 
-LIST_TOTALORDERMAG_TESTS(float128, LIBC_NAMESPACE::totalordermagf128)
+LIST_TOTALORDERMAG_TESTS(Totalordermagf128, float128,
+                         LIBC_NAMESPACE::totalordermagf128)
diff --git a/libc/test/src/math/smoke/totalordermagf16_test.cpp b/libc/test/src/math/smoke/totalordermagf16_test.cpp
index b09eb11cd9c3b..c5e88ebe1411d 100644
--- a/libc/test/src/math/smoke/totalordermagf16_test.cpp
+++ b/libc/test/src/math/smoke/totalordermagf16_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/totalordermagf16.h"
 
-LIST_TOTALORDERMAG_TESTS(float16, LIBC_NAMESPACE::totalordermagf16)
+LIST_TOTALORDERMAG_TESTS(Totalordermagf16, float16,
+                         LIBC_NAMESPACE::totalordermagf16)
diff --git a/libc/test/src/math/smoke/totalordermagf_test.cpp b/libc/test/src/math/smoke/totalordermagf_test.cpp
index c54cea21a52c7..0daf37b5e4c6e 100644
--- a/libc/test/src/math/smoke/totalordermagf_test.cpp
+++ b/libc/test/src/math/smoke/totalordermagf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/totalordermagf.h"
 
-LIST_TOTALORDERMAG_TESTS(float, LIBC_NAMESPACE::totalordermagf)
+LIST_TOTALORDERMAG_TESTS(Totalordermagf, float, LIBC_NAMESPACE::totalordermagf)
diff --git a/libc/test/src/math/smoke/totalordermagl_test.cpp b/libc/test/src/math/smoke/totalordermagl_test.cpp
index bdb9f616aded7..91506d7fa358e 100644
--- a/libc/test/src/math/smoke/totalordermagl_test.cpp
+++ b/libc/test/src/math/smoke/totalordermagl_test.cpp
@@ -10,4 +10,5 @@
 
 #include "src/math/totalordermagl.h"
 
-LIST_TOTALORDERMAG_TESTS(long double, LIBC_NAMESPACE::totalordermagl)
+LIST_TOTALORDERMAG_TESTS(Totalordermagl, long double,
+                         LIBC_NAMESPACE::totalordermagl)
diff --git a/libc/test/src/math/smoke/trunc_test.cpp b/libc/test/src/math/smoke/trunc_test.cpp
index eb71f23e02f4b..665b3671e4242 100644
--- a/libc/test/src/math/smoke/trunc_test.cpp
+++ b/libc/test/src/math/smoke/trunc_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/trunc.h"
 
-LIST_TRUNC_TESTS(double, LIBC_NAMESPACE::trunc)
+LIST_TRUNC_TESTS(Trunc, double, LIBC_NAMESPACE::trunc)
diff --git a/libc/test/src/math/smoke/truncbf16_test.cpp b/libc/test/src/math/smoke/truncbf16_test.cpp
index 970fa69b3c7a1..9a80e42d1748e 100644
--- a/libc/test/src/math/smoke/truncbf16_test.cpp
+++ b/libc/test/src/math/smoke/truncbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/truncbf16.h"
 
-LIST_TRUNC_TESTS(bfloat16, LIBC_NAMESPACE::truncbf16)
+LIST_TRUNC_TESTS(Truncbf16, bfloat16, LIBC_NAMESPACE::truncbf16)
diff --git a/libc/test/src/math/smoke/truncf128_test.cpp b/libc/test/src/math/smoke/truncf128_test.cpp
index f486213110b6b..3adae144eab91 100644
--- a/libc/test/src/math/smoke/truncf128_test.cpp
+++ b/libc/test/src/math/smoke/truncf128_test.cpp
@@ -14,4 +14,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_TRUNC_TESTS(float128, LIBC_NAMESPACE::truncf128)
+LIST_TRUNC_TESTS(Truncf128, float128, LIBC_NAMESPACE::truncf128)
diff --git a/libc/test/src/math/smoke/truncf16_test.cpp b/libc/test/src/math/smoke/truncf16_test.cpp
index 832d88ec84f8e..3b218809a52e6 100644
--- a/libc/test/src/math/smoke/truncf16_test.cpp
+++ b/libc/test/src/math/smoke/truncf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncf16.h"
 
-LIST_TRUNC_TESTS(float16, LIBC_NAMESPACE::truncf16)
+LIST_TRUNC_TESTS(Truncf16, float16, LIBC_NAMESPACE::truncf16)
diff --git a/libc/test/src/math/smoke/truncf_test.cpp b/libc/test/src/math/smoke/truncf_test.cpp
index 9a85b8274b0e5..fe3d031d6dfc9 100644
--- a/libc/test/src/math/smoke/truncf_test.cpp
+++ b/libc/test/src/math/smoke/truncf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncf.h"
 
-LIST_TRUNC_TESTS(float, LIBC_NAMESPACE::truncf)
+LIST_TRUNC_TESTS(Truncf, float, LIBC_NAMESPACE::truncf)
diff --git a/libc/test/src/math/smoke/truncl_test.cpp b/libc/test/src/math/smoke/truncl_test.cpp
index d296bfe33cb07..205aee0a919b3 100644
--- a/libc/test/src/math/smoke/truncl_test.cpp
+++ b/libc/test/src/math/smoke/truncl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncl.h"
 
-LIST_TRUNC_TESTS(long double, LIBC_NAMESPACE::truncl)
+LIST_TRUNC_TESTS(Truncl, long double, LIBC_NAMESPACE::truncl)
diff --git a/libc/test/src/math/smoke/ufromfp_test.cpp b/libc/test/src/math/smoke/ufromfp_test.cpp
index ff47621124006..bb64b67dcc713 100644
--- a/libc/test/src/math/smoke/ufromfp_test.cpp
+++ b/libc/test/src/math/smoke/ufromfp_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfp.h"
 
-LIST_UFROMFP_TESTS(double, LIBC_NAMESPACE::ufromfp)
+LIST_UFROMFP_TESTS(Ufromfp, double, LIBC_NAMESPACE::ufromfp)
diff --git a/libc/test/src/math/smoke/ufromfpbf16_test.cpp b/libc/test/src/math/smoke/ufromfpbf16_test.cpp
index 2c516b0304ef7..4b1e0944ef305 100644
--- a/libc/test/src/math/smoke/ufromfpbf16_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ufromfpbf16.h"
 
-LIST_UFROMFP_TESTS(bfloat16, LIBC_NAMESPACE::ufromfpbf16)
+LIST_UFROMFP_TESTS(Ufromfpbf16, bfloat16, LIBC_NAMESPACE::ufromfpbf16)
diff --git a/libc/test/src/math/smoke/ufromfpf128_test.cpp b/libc/test/src/math/smoke/ufromfpf128_test.cpp
index 9ba3034f6e61f..4d75e603e07e1 100644
--- a/libc/test/src/math/smoke/ufromfpf128_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpf128.h"
 
-LIST_UFROMFP_TESTS(float128, LIBC_NAMESPACE::ufromfpf128)
+LIST_UFROMFP_TESTS(Ufromfpf128, float128, LIBC_NAMESPACE::ufromfpf128)
diff --git a/libc/test/src/math/smoke/ufromfpf16_test.cpp b/libc/test/src/math/smoke/ufromfpf16_test.cpp
index 641ba823cd03f..61765803fed15 100644
--- a/libc/test/src/math/smoke/ufromfpf16_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpf16.h"
 
-LIST_UFROMFP_TESTS(float16, LIBC_NAMESPACE::ufromfpf16)
+LIST_UFROMFP_TESTS(Ufromfpf16, float16, LIBC_NAMESPACE::ufromfpf16)
diff --git a/libc/test/src/math/smoke/ufromfpf_test.cpp b/libc/test/src/math/smoke/ufromfpf_test.cpp
index 2913b31e20bda..1a8cbb4911e82 100644
--- a/libc/test/src/math/smoke/ufromfpf_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpf.h"
 
-LIST_UFROMFP_TESTS(float, LIBC_NAMESPACE::ufromfpf)
+LIST_UFROMFP_TESTS(Ufromfpf, float, LIBC_NAMESPACE::ufromfpf)
diff --git a/libc/test/src/math/smoke/ufromfpl_test.cpp b/libc/test/src/math/smoke/ufromfpl_test.cpp
index 8976056756e45..a0a928dfacb98 100644
--- a/libc/test/src/math/smoke/ufromfpl_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpl.h"
 
-LIST_UFROMFP_TESTS(long double, LIBC_NAMESPACE::ufromfpl)
+LIST_UFROMFP_TESTS(Ufromfpl, long double, LIBC_NAMESPACE::ufromfpl)
diff --git a/libc/test/src/math/smoke/ufromfpx_test.cpp b/libc/test/src/math/smoke/ufromfpx_test.cpp
index 3bb45e428f286..066a5292775bf 100644
--- a/libc/test/src/math/smoke/ufromfpx_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpx_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpx.h"
 
-LIST_UFROMFPX_TESTS(double, LIBC_NAMESPACE::ufromfpx)
+LIST_UFROMFPX_TESTS(Ufromfpx, double, LIBC_NAMESPACE::ufromfpx)
diff --git a/libc/test/src/math/smoke/ufromfpxbf16_test.cpp b/libc/test/src/math/smoke/ufromfpxbf16_test.cpp
index 56e27276b4741..977f60ca0edcb 100644
--- a/libc/test/src/math/smoke/ufromfpxbf16_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpxbf16_test.cpp
@@ -11,4 +11,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/ufromfpxbf16.h"
 
-LIST_UFROMFPX_TESTS(bfloat16, LIBC_NAMESPACE::ufromfpxbf16)
+LIST_UFROMFPX_TESTS(Ufromfpxbf16, bfloat16, LIBC_NAMESPACE::ufromfpxbf16)
diff --git a/libc/test/src/math/smoke/ufromfpxf128_test.cpp b/libc/test/src/math/smoke/ufromfpxf128_test.cpp
index 6defaf7fee3dd..1fa4b1c97bea3 100644
--- a/libc/test/src/math/smoke/ufromfpxf128_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpxf128_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpxf128.h"
 
-LIST_UFROMFPX_TESTS(float128, LIBC_NAMESPACE::ufromfpxf128)
+LIST_UFROMFPX_TESTS(Ufromfpxf128, float128, LIBC_NAMESPACE::ufromfpxf128)
diff --git a/libc/test/src/math/smoke/ufromfpxf16_test.cpp b/libc/test/src/math/smoke/ufromfpxf16_test.cpp
index 50d93b2545c47..085d82c074df9 100644
--- a/libc/test/src/math/smoke/ufromfpxf16_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpxf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpxf16.h"
 
-LIST_UFROMFPX_TESTS(float16, LIBC_NAMESPACE::ufromfpxf16)
+LIST_UFROMFPX_TESTS(Ufromfpxf16, float16, LIBC_NAMESPACE::ufromfpxf16)
diff --git a/libc/test/src/math/smoke/ufromfpxf_test.cpp b/libc/test/src/math/smoke/ufromfpxf_test.cpp
index 862fd4c2cdac6..55c319fa9efec 100644
--- a/libc/test/src/math/smoke/ufromfpxf_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpxf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpxf.h"
 
-LIST_UFROMFPX_TESTS(float, LIBC_NAMESPACE::ufromfpxf)
+LIST_UFROMFPX_TESTS(Ufromfpxf, float, LIBC_NAMESPACE::ufromfpxf)
diff --git a/libc/test/src/math/smoke/ufromfpxl_test.cpp b/libc/test/src/math/smoke/ufromfpxl_test.cpp
index b6b93b38e6be2..b82b138f21095 100644
--- a/libc/test/src/math/smoke/ufromfpxl_test.cpp
+++ b/libc/test/src/math/smoke/ufromfpxl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/ufromfpxl.h"
 
-LIST_UFROMFPX_TESTS(long double, LIBC_NAMESPACE::ufromfpxl)
+LIST_UFROMFPX_TESTS(Ufromfpxl, long double, LIBC_NAMESPACE::ufromfpxl)
diff --git a/libc/test/src/math/sqrt_test.cpp b/libc/test/src/math/sqrt_test.cpp
index 1551b31d6f715..eabc75458f927 100644
--- a/libc/test/src/math/sqrt_test.cpp
+++ b/libc/test/src/math/sqrt_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrt.h"
 
-LIST_SQRT_TESTS(double, LIBC_NAMESPACE::sqrt)
+LIST_SQRT_TESTS(Sqrt, double, LIBC_NAMESPACE::sqrt)
diff --git a/libc/test/src/math/sqrtbf16_test.cpp b/libc/test/src/math/sqrtbf16_test.cpp
index 186ddd5487133..b305c1f9abe76 100644
--- a/libc/test/src/math/sqrtbf16_test.cpp
+++ b/libc/test/src/math/sqrtbf16_test.cpp
@@ -12,7 +12,7 @@
 #include "test/UnitTest/Test.h"
 #include "utils/MPFRWrapper/MPFRUtils.h"
 
-using LlvmLibcSqrtf16Test = LIBC_NAMESPACE::testing::FPTest<bfloat16>;
+using LlvmLibcSqrtbf16Test = LIBC_NAMESPACE::testing::FPTest<bfloat16>;
 
 namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
 
@@ -20,7 +20,7 @@ namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
 static constexpr uint16_t POS_START = 0x0000U;
 static constexpr uint16_t POS_STOP = 0x7f80U;
 
-TEST_F(LlvmLibcSqrtf16Test, PositiveRange) {
+TEST_F(LlvmLibcSqrtbf16Test, PositiveRange) {
   for (uint16_t v = POS_START; v <= POS_STOP; ++v) {
     bfloat16 x = FPBits(v).get_val();
     EXPECT_MPFR_MATCH_ALL_ROUNDING(mpfr::Operation::Sqrt, x,
diff --git a/libc/test/src/math/sqrtf128_test.cpp b/libc/test/src/math/sqrtf128_test.cpp
index a04d21f040075..3a294a0724b78 100644
--- a/libc/test/src/math/sqrtf128_test.cpp
+++ b/libc/test/src/math/sqrtf128_test.cpp
@@ -18,9 +18,9 @@ using LIBC_NAMESPACE::operator""_u128;
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_SQRT_TESTS(float128, LIBC_NAMESPACE::sqrtf128)
+LIST_SQRT_TESTS(Sqrtf128, float128, LIBC_NAMESPACE::sqrtf128)
 
-TEST_F(LlvmLibcSqrtTest, SpecialInputs) {
+TEST_F(LlvmLibcSqrtf128Test, SpecialInputs) {
   using FPBits = LIBC_NAMESPACE::fputil::FPBits<float128>;
 
   float128 INPUTS[] = {
diff --git a/libc/test/src/math/sqrtf_test.cpp b/libc/test/src/math/sqrtf_test.cpp
index 3f2e973325bd0..b5d2206c4308d 100644
--- a/libc/test/src/math/sqrtf_test.cpp
+++ b/libc/test/src/math/sqrtf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrtf.h"
 
-LIST_SQRT_TESTS(float, LIBC_NAMESPACE::sqrtf)
+LIST_SQRT_TESTS(Sqrtf, float, LIBC_NAMESPACE::sqrtf)
diff --git a/libc/test/src/math/sqrtl_test.cpp b/libc/test/src/math/sqrtl_test.cpp
index f80bcfb736078..0937ac657452e 100644
--- a/libc/test/src/math/sqrtl_test.cpp
+++ b/libc/test/src/math/sqrtl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/sqrtl.h"
 
-LIST_SQRT_TESTS(long double, LIBC_NAMESPACE::sqrtl)
+LIST_SQRT_TESTS(Sqrtl, long double, LIBC_NAMESPACE::sqrtl)
diff --git a/libc/test/src/math/trunc_test.cpp b/libc/test/src/math/trunc_test.cpp
index eb71f23e02f4b..665b3671e4242 100644
--- a/libc/test/src/math/trunc_test.cpp
+++ b/libc/test/src/math/trunc_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/trunc.h"
 
-LIST_TRUNC_TESTS(double, LIBC_NAMESPACE::trunc)
+LIST_TRUNC_TESTS(Trunc, double, LIBC_NAMESPACE::trunc)
diff --git a/libc/test/src/math/truncbf16_test.cpp b/libc/test/src/math/truncbf16_test.cpp
index 398185208947b..d1a0ebcf6f7e8 100644
--- a/libc/test/src/math/truncbf16_test.cpp
+++ b/libc/test/src/math/truncbf16_test.cpp
@@ -16,4 +16,4 @@
 #include "src/__support/FPUtil/bfloat16.h"
 #include "src/math/truncbf16.h"
 
-LIST_TRUNC_TESTS(bfloat16, LIBC_NAMESPACE::truncbf16)
+LIST_TRUNC_TESTS(Truncbf16, bfloat16, LIBC_NAMESPACE::truncbf16)
diff --git a/libc/test/src/math/truncf128_test.cpp b/libc/test/src/math/truncf128_test.cpp
index 592a6b7cd55e7..7245347204cf5 100644
--- a/libc/test/src/math/truncf128_test.cpp
+++ b/libc/test/src/math/truncf128_test.cpp
@@ -15,4 +15,4 @@
 using float128 = LIBC_NAMESPACE::fputil::Float128;
 #endif // LIBC_TYPES_HAS_NATIVE_FLOAT128
 
-LIST_TRUNC_TESTS(float128, LIBC_NAMESPACE::truncf128)
+LIST_TRUNC_TESTS(Truncf128, float128, LIBC_NAMESPACE::truncf128)
diff --git a/libc/test/src/math/truncf16_test.cpp b/libc/test/src/math/truncf16_test.cpp
index 832d88ec84f8e..3b218809a52e6 100644
--- a/libc/test/src/math/truncf16_test.cpp
+++ b/libc/test/src/math/truncf16_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncf16.h"
 
-LIST_TRUNC_TESTS(float16, LIBC_NAMESPACE::truncf16)
+LIST_TRUNC_TESTS(Truncf16, float16, LIBC_NAMESPACE::truncf16)
diff --git a/libc/test/src/math/truncf_test.cpp b/libc/test/src/math/truncf_test.cpp
index 9a85b8274b0e5..fe3d031d6dfc9 100644
--- a/libc/test/src/math/truncf_test.cpp
+++ b/libc/test/src/math/truncf_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncf.h"
 
-LIST_TRUNC_TESTS(float, LIBC_NAMESPACE::truncf)
+LIST_TRUNC_TESTS(Truncf, float, LIBC_NAMESPACE::truncf)
diff --git a/libc/test/src/math/truncl_test.cpp b/libc/test/src/math/truncl_test.cpp
index d296bfe33cb07..205aee0a919b3 100644
--- a/libc/test/src/math/truncl_test.cpp
+++ b/libc/test/src/math/truncl_test.cpp
@@ -10,4 +10,4 @@
 
 #include "src/math/truncl.h"
 
-LIST_TRUNC_TESTS(long double, LIBC_NAMESPACE::truncl)
+LIST_TRUNC_TESTS(Truncl, long double, LIBC_NAMESPACE::truncl)



More information about the libc-commits mailing list