native: Unify asm backend symbol naming

Every aarch64 asm symbol now ends in `_aarch64_asm`; every x86_64
avx2 symbol now ends in `_avx2_asm`.

Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>

Author: mkannwischer

BIBLIOGRAPHY.md

@@ -23,10 +23,10 @@ source code and documentation.
   - Gregor Seiler
 * URL: https://eprint.iacr.org/2018/039
 * Referenced from:
-  - [dev/x86_64/src/intt.S](dev/x86_64/src/intt.S)
-  - [dev/x86_64/src/ntt.S](dev/x86_64/src/ntt.S)
-  - [mlkem/src/native/x86_64/src/intt.S](mlkem/src/native/x86_64/src/intt.S)
-  - [mlkem/src/native/x86_64/src/ntt.S](mlkem/src/native/x86_64/src/ntt.S)
+  - [dev/x86_64/src/intt_avx2_asm.S](dev/x86_64/src/intt_avx2_asm.S)
+  - [dev/x86_64/src/ntt_avx2_asm.S](dev/x86_64/src/ntt_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/intt_avx2_asm.S](mlkem/src/native/x86_64/src/intt_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/ntt_avx2_asm.S](mlkem/src/native/x86_64/src/ntt_avx2_asm.S)
   - [proofs/hol_light/x86_64/mlkem/mlkem_intt.S](proofs/hol_light/x86_64/mlkem/mlkem_intt.S)
   - [proofs/hol_light/x86_64/mlkem/mlkem_ntt.S](proofs/hol_light/x86_64/mlkem/mlkem_ntt.S)
 
@@ -182,11 +182,11 @@ source code and documentation.
 * Referenced from:
   - [README.md](README.md)
   - [dev/fips202/aarch64/auto.h](dev/fips202/aarch64/auto.h)
-  - [dev/fips202/aarch64/src/keccak_f1600_x1_v84a_asm.S](dev/fips202/aarch64/src/keccak_f1600_x1_v84a_asm.S)
-  - [dev/fips202/aarch64/src/keccak_f1600_x2_v84a_asm.S](dev/fips202/aarch64/src/keccak_f1600_x2_v84a_asm.S)
+  - [dev/fips202/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S](dev/fips202/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S)
+  - [dev/fips202/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S](dev/fips202/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S)
   - [mlkem/src/fips202/native/aarch64/auto.h](mlkem/src/fips202/native/aarch64/auto.h)
-  - [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_asm.S)
-  - [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_asm.S)
+  - [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S)
+  - [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S)
   - [proofs/hol_light/README.md](proofs/hol_light/README.md)
   - [proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a.S)
   - [proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a.S)
@@ -222,23 +222,23 @@ source code and documentation.
 * URL: https://eprint.iacr.org/2021/986
 * Referenced from:
   - [dev/aarch64_clean/README.md](dev/aarch64_clean/README.md)
-  - [dev/aarch64_clean/src/intt.S](dev/aarch64_clean/src/intt.S)
-  - [dev/aarch64_clean/src/ntt.S](dev/aarch64_clean/src/ntt.S)
-  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S)
-  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S)
-  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S)
+  - [dev/aarch64_clean/src/intt_aarch64_asm.S](dev/aarch64_clean/src/intt_aarch64_asm.S)
+  - [dev/aarch64_clean/src/ntt_aarch64_asm.S](dev/aarch64_clean/src/ntt_aarch64_asm.S)
+  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S)
+  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S)
+  - [dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S](dev/aarch64_clean/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S)
   - [dev/aarch64_opt/README.md](dev/aarch64_opt/README.md)
-  - [dev/aarch64_opt/src/intt.S](dev/aarch64_opt/src/intt.S)
-  - [dev/aarch64_opt/src/ntt.S](dev/aarch64_opt/src/ntt.S)
-  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S)
-  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S)
-  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S)
+  - [dev/aarch64_opt/src/intt_aarch64_asm.S](dev/aarch64_opt/src/intt_aarch64_asm.S)
+  - [dev/aarch64_opt/src/ntt_aarch64_asm.S](dev/aarch64_opt/src/ntt_aarch64_asm.S)
+  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S)
+  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S)
+  - [dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S](dev/aarch64_opt/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S)
   - [mlkem/src/native/aarch64/README.md](mlkem/src/native/aarch64/README.md)
-  - [mlkem/src/native/aarch64/src/intt.S](mlkem/src/native/aarch64/src/intt.S)
-  - [mlkem/src/native/aarch64/src/ntt.S](mlkem/src/native/aarch64/src/ntt.S)
-  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k2.S)
-  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k3.S)
-  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_asm_k4.S)
+  - [mlkem/src/native/aarch64/src/intt_aarch64_asm.S](mlkem/src/native/aarch64/src/intt_aarch64_asm.S)
+  - [mlkem/src/native/aarch64/src/ntt_aarch64_asm.S](mlkem/src/native/aarch64/src/ntt_aarch64_asm.S)
+  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S)
+  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S)
+  - [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S)
   - [mlkem/src/poly.c](mlkem/src/poly.c)
   - [mlkem/src/poly_k.c](mlkem/src/poly_k.c)
   - [proofs/hol_light/aarch64/mlkem/mlkem_intt.S](proofs/hol_light/aarch64/mlkem/mlkem_intt.S)
@@ -290,36 +290,36 @@ source code and documentation.
 * URL: https://github.com/pq-crystals/kyber/tree/main/avx2
 * Referenced from:
   - [dev/x86_64/README.md](dev/x86_64/README.md)
-  - [dev/x86_64/src/intt.S](dev/x86_64/src/intt.S)
-  - [dev/x86_64/src/ntt.S](dev/x86_64/src/ntt.S)
-  - [dev/x86_64/src/nttfrombytes.S](dev/x86_64/src/nttfrombytes.S)
-  - [dev/x86_64/src/ntttobytes.S](dev/x86_64/src/ntttobytes.S)
-  - [dev/x86_64/src/nttunpack.S](dev/x86_64/src/nttunpack.S)
-  - [dev/x86_64/src/poly_compress_d10.S](dev/x86_64/src/poly_compress_d10.S)
-  - [dev/x86_64/src/poly_compress_d11.S](dev/x86_64/src/poly_compress_d11.S)
-  - [dev/x86_64/src/poly_compress_d4.S](dev/x86_64/src/poly_compress_d4.S)
-  - [dev/x86_64/src/poly_compress_d5.S](dev/x86_64/src/poly_compress_d5.S)
-  - [dev/x86_64/src/poly_decompress_d10.S](dev/x86_64/src/poly_decompress_d10.S)
-  - [dev/x86_64/src/poly_decompress_d11.S](dev/x86_64/src/poly_decompress_d11.S)
-  - [dev/x86_64/src/poly_decompress_d4.S](dev/x86_64/src/poly_decompress_d4.S)
-  - [dev/x86_64/src/poly_decompress_d5.S](dev/x86_64/src/poly_decompress_d5.S)
-  - [dev/x86_64/src/reduce.S](dev/x86_64/src/reduce.S)
-  - [dev/x86_64/src/tomont.S](dev/x86_64/src/tomont.S)
-  - [mlkem/src/native/x86_64/src/intt.S](mlkem/src/native/x86_64/src/intt.S)
-  - [mlkem/src/native/x86_64/src/ntt.S](mlkem/src/native/x86_64/src/ntt.S)
-  - [mlkem/src/native/x86_64/src/nttfrombytes.S](mlkem/src/native/x86_64/src/nttfrombytes.S)
-  - [mlkem/src/native/x86_64/src/ntttobytes.S](mlkem/src/native/x86_64/src/ntttobytes.S)
-  - [mlkem/src/native/x86_64/src/nttunpack.S](mlkem/src/native/x86_64/src/nttunpack.S)
-  - [mlkem/src/native/x86_64/src/poly_compress_d10.S](mlkem/src/native/x86_64/src/poly_compress_d10.S)
-  - [mlkem/src/native/x86_64/src/poly_compress_d11.S](mlkem/src/native/x86_64/src/poly_compress_d11.S)
-  - [mlkem/src/native/x86_64/src/poly_compress_d4.S](mlkem/src/native/x86_64/src/poly_compress_d4.S)
-  - [mlkem/src/native/x86_64/src/poly_compress_d5.S](mlkem/src/native/x86_64/src/poly_compress_d5.S)
-  - [mlkem/src/native/x86_64/src/poly_decompress_d10.S](mlkem/src/native/x86_64/src/poly_decompress_d10.S)
-  - [mlkem/src/native/x86_64/src/poly_decompress_d11.S](mlkem/src/native/x86_64/src/poly_decompress_d11.S)
-  - [mlkem/src/native/x86_64/src/poly_decompress_d4.S](mlkem/src/native/x86_64/src/poly_decompress_d4.S)
-  - [mlkem/src/native/x86_64/src/poly_decompress_d5.S](mlkem/src/native/x86_64/src/poly_decompress_d5.S)
-  - [mlkem/src/native/x86_64/src/reduce.S](mlkem/src/native/x86_64/src/reduce.S)
-  - [mlkem/src/native/x86_64/src/tomont.S](mlkem/src/native/x86_64/src/tomont.S)
+  - [dev/x86_64/src/intt_avx2_asm.S](dev/x86_64/src/intt_avx2_asm.S)
+  - [dev/x86_64/src/ntt_avx2_asm.S](dev/x86_64/src/ntt_avx2_asm.S)
+  - [dev/x86_64/src/nttfrombytes_avx2_asm.S](dev/x86_64/src/nttfrombytes_avx2_asm.S)
+  - [dev/x86_64/src/ntttobytes_avx2_asm.S](dev/x86_64/src/ntttobytes_avx2_asm.S)
+  - [dev/x86_64/src/nttunpack_avx2_asm.S](dev/x86_64/src/nttunpack_avx2_asm.S)
+  - [dev/x86_64/src/poly_compress_d10_avx2_asm.S](dev/x86_64/src/poly_compress_d10_avx2_asm.S)
+  - [dev/x86_64/src/poly_compress_d11_avx2_asm.S](dev/x86_64/src/poly_compress_d11_avx2_asm.S)
+  - [dev/x86_64/src/poly_compress_d4_avx2_asm.S](dev/x86_64/src/poly_compress_d4_avx2_asm.S)
+  - [dev/x86_64/src/poly_compress_d5_avx2_asm.S](dev/x86_64/src/poly_compress_d5_avx2_asm.S)
+  - [dev/x86_64/src/poly_decompress_d10_avx2_asm.S](dev/x86_64/src/poly_decompress_d10_avx2_asm.S)
+  - [dev/x86_64/src/poly_decompress_d11_avx2_asm.S](dev/x86_64/src/poly_decompress_d11_avx2_asm.S)
+  - [dev/x86_64/src/poly_decompress_d4_avx2_asm.S](dev/x86_64/src/poly_decompress_d4_avx2_asm.S)
+  - [dev/x86_64/src/poly_decompress_d5_avx2_asm.S](dev/x86_64/src/poly_decompress_d5_avx2_asm.S)
+  - [dev/x86_64/src/reduce_avx2_asm.S](dev/x86_64/src/reduce_avx2_asm.S)
+  - [dev/x86_64/src/tomont_avx2_asm.S](dev/x86_64/src/tomont_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/intt_avx2_asm.S](mlkem/src/native/x86_64/src/intt_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/ntt_avx2_asm.S](mlkem/src/native/x86_64/src/ntt_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/nttfrombytes_avx2_asm.S](mlkem/src/native/x86_64/src/nttfrombytes_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/ntttobytes_avx2_asm.S](mlkem/src/native/x86_64/src/ntttobytes_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/nttunpack_avx2_asm.S](mlkem/src/native/x86_64/src/nttunpack_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_compress_d10_avx2_asm.S](mlkem/src/native/x86_64/src/poly_compress_d10_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_compress_d11_avx2_asm.S](mlkem/src/native/x86_64/src/poly_compress_d11_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_compress_d4_avx2_asm.S](mlkem/src/native/x86_64/src/poly_compress_d4_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_compress_d5_avx2_asm.S](mlkem/src/native/x86_64/src/poly_compress_d5_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_decompress_d10_avx2_asm.S](mlkem/src/native/x86_64/src/poly_decompress_d10_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_decompress_d11_avx2_asm.S](mlkem/src/native/x86_64/src/poly_decompress_d11_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_decompress_d4_avx2_asm.S](mlkem/src/native/x86_64/src/poly_decompress_d4_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/poly_decompress_d5_avx2_asm.S](mlkem/src/native/x86_64/src/poly_decompress_d5_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/reduce_avx2_asm.S](mlkem/src/native/x86_64/src/reduce_avx2_asm.S)
+  - [mlkem/src/native/x86_64/src/tomont_avx2_asm.S](mlkem/src/native/x86_64/src/tomont_avx2_asm.S)
   - [proofs/hol_light/x86_64/mlkem/mlkem_frombytes.S](proofs/hol_light/x86_64/mlkem/mlkem_frombytes.S)
   - [proofs/hol_light/x86_64/mlkem/mlkem_intt.S](proofs/hol_light/x86_64/mlkem/mlkem_intt.S)
   - [proofs/hol_light/x86_64/mlkem/mlkem_ntt.S](proofs/hol_light/x86_64/mlkem/mlkem_ntt.S)
@@ -362,14 +362,14 @@ source code and documentation.
   - [README.md](README.md)
   - [dev/README.md](dev/README.md)
   - [dev/aarch64_clean/README.md](dev/aarch64_clean/README.md)
-  - [dev/aarch64_clean/src/intt.S](dev/aarch64_clean/src/intt.S)
-  - [dev/aarch64_clean/src/ntt.S](dev/aarch64_clean/src/ntt.S)
+  - [dev/aarch64_clean/src/intt_aarch64_asm.S](dev/aarch64_clean/src/intt_aarch64_asm.S)
+  - [dev/aarch64_clean/src/ntt_aarch64_asm.S](dev/aarch64_clean/src/ntt_aarch64_asm.S)
   - [dev/aarch64_opt/README.md](dev/aarch64_opt/README.md)
-  - [dev/aarch64_opt/src/intt.S](dev/aarch64_opt/src/intt.S)
-  - [dev/aarch64_opt/src/ntt.S](dev/aarch64_opt/src/ntt.S)
+  - [dev/aarch64_opt/src/intt_aarch64_asm.S](dev/aarch64_opt/src/intt_aarch64_asm.S)
+  - [dev/aarch64_opt/src/ntt_aarch64_asm.S](dev/aarch64_opt/src/ntt_aarch64_asm.S)
   - [mlkem/src/native/aarch64/README.md](mlkem/src/native/aarch64/README.md)
-  - [mlkem/src/native/aarch64/src/intt.S](mlkem/src/native/aarch64/src/intt.S)
-  - [mlkem/src/native/aarch64/src/ntt.S](mlkem/src/native/aarch64/src/ntt.S)
+  - [mlkem/src/native/aarch64/src/intt_aarch64_asm.S](mlkem/src/native/aarch64/src/intt_aarch64_asm.S)
+  - [mlkem/src/native/aarch64/src/ntt_aarch64_asm.S](mlkem/src/native/aarch64/src/ntt_aarch64_asm.S)
   - [proofs/hol_light/aarch64/mlkem/mlkem_intt.S](proofs/hol_light/aarch64/mlkem/mlkem_intt.S)
   - [proofs/hol_light/aarch64/mlkem/mlkem_ntt.S](proofs/hol_light/aarch64/mlkem/mlkem_ntt.S)
 

README.md

@@ -99,7 +99,7 @@ mlkem-native currently offers the following backends:
 If you'd like contribute new backends, please reach out or just open a PR.
 
 Our AArch64 assembly is developed using the [SLOTHY](https://github.com/slothy-optimizer/slothy) superoptimizer, following the approach described in the SLOTHY paper[^SLOTHY_Paper]:
-We write 'clean' assembly by hand and automate micro-optimizations (e.g. see the [clean](dev/aarch64_clean/src/ntt.S) vs [optimized](dev/aarch64_opt/src/ntt.S) AArch64 NTT).
+We write 'clean' assembly by hand and automate micro-optimizations (e.g. see the [clean](dev/aarch64_clean/src/ntt_aarch64_asm.S) vs [optimized](dev/aarch64_opt/src/ntt_aarch64_asm.S) AArch64 NTT).
 See [dev/README.md](dev/README.md) for more details.
 
 ## Test Vectors

SOUNDNESS.md

@@ -310,7 +310,7 @@ arithmetic bounds, and constant tables.
   satisfies `abs(ival zi) <= &23594` and `(ival zi == forward_ntt (ival o x) i) (mod &3329)`.
   In other words, we provide a description of the underlying modular arithmetic function (here, the NTT),
   plus a bound on the concrete being computed.
-- The CBMC contract on `mlk_ntt_asm` simplifies this to the mere bounds assertions
+- The CBMC contract on `mlk_ntt_aarch64_asm` simplifies this to the mere bounds assertions
   `requires(array_abs_bound(p, 0, MLKEM_N, 8192))`
   and `ensures(array_abs_bound(p, 0, MLKEM_N, 23595))`, omitting the description of the
   functional behavior.

dev/aarch64_clean/meta.h

@@ -28,39 +28,40 @@
 MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_ntt_native(int16_t data[MLKEM_N])
 {
-  mlk_ntt_asm(data, mlk_aarch64_ntt_zetas_layer12345,
-              mlk_aarch64_ntt_zetas_layer67);
+  mlk_ntt_aarch64_asm(data, mlk_aarch64_ntt_zetas_layer12345,
+                      mlk_aarch64_ntt_zetas_layer67);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
 MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_intt_native(int16_t data[MLKEM_N])
 {
-  mlk_intt_asm(data, mlk_aarch64_invntt_zetas_layer12345,
-               mlk_aarch64_invntt_zetas_layer67);
+  mlk_intt_aarch64_asm(data, mlk_aarch64_invntt_zetas_layer12345,
+                       mlk_aarch64_invntt_zetas_layer67);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
 MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_poly_reduce_native(int16_t data[MLKEM_N])
 {
-  mlk_poly_reduce_asm(data);
+  mlk_poly_reduce_aarch64_asm(data);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
 MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_poly_tomont_native(int16_t data[MLKEM_N])
 {
-  mlk_poly_tomont_asm(data);
+  mlk_poly_tomont_aarch64_asm(data);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
 MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_poly_mulcache_compute_native(int16_t x[MLKEM_N / 2],
                                                        const int16_t y[MLKEM_N])
 {
-  mlk_poly_mulcache_compute_asm(x, y, mlk_aarch64_zetas_mulcache_native,
-                                mlk_aarch64_zetas_mulcache_twisted_native);
+  mlk_poly_mulcache_compute_aarch64_asm(
+      x, y, mlk_aarch64_zetas_mulcache_native,
+      mlk_aarch64_zetas_mulcache_twisted_native);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
@@ -70,7 +71,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k2_native(
     int16_t r[MLKEM_N], const int16_t a[2 * MLKEM_N],
     const int16_t b[2 * MLKEM_N], const int16_t b_cache[2 * (MLKEM_N / 2)])
 {
-  mlk_polyvec_basemul_acc_montgomery_cached_asm_k2(r, a, b, b_cache);
+  mlk_polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm(r, a, b, b_cache);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 #endif /* MLK_CONFIG_MULTILEVEL_WITH_SHARED || MLKEM_K == 2 */
@@ -81,7 +82,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k3_native(
     int16_t r[MLKEM_N], const int16_t a[3 * MLKEM_N],
     const int16_t b[3 * MLKEM_N], const int16_t b_cache[3 * (MLKEM_N / 2)])
 {
-  mlk_polyvec_basemul_acc_montgomery_cached_asm_k3(r, a, b, b_cache);
+  mlk_polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm(r, a, b, b_cache);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 #endif /* MLK_CONFIG_MULTILEVEL_WITH_SHARED || MLKEM_K == 3 */
@@ -92,7 +93,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k4_native(
     int16_t r[MLKEM_N], const int16_t a[4 * MLKEM_N],
     const int16_t b[4 * MLKEM_N], const int16_t b_cache[4 * (MLKEM_N / 2)])
 {
-  mlk_polyvec_basemul_acc_montgomery_cached_asm_k4(r, a, b, b_cache);
+  mlk_polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm(r, a, b, b_cache);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 #endif /* MLK_CONFIG_MULTILEVEL_WITH_SHARED || MLKEM_K == 4 */
@@ -101,7 +102,7 @@ MLK_MUST_CHECK_RETURN_VALUE
 static MLK_INLINE int mlk_poly_tobytes_native(uint8_t r[MLKEM_POLYBYTES],
                                               const int16_t a[MLKEM_N])
 {
-  mlk_poly_tobytes_asm(r, a);
+  mlk_poly_tobytes_aarch64_asm(r, a);
   return MLK_NATIVE_FUNC_SUCCESS;
 }
 
@@ -115,7 +116,8 @@ static MLK_INLINE int mlk_rej_uniform_native(int16_t *r, unsigned len,
   {
     return MLK_NATIVE_FUNC_FALLBACK;
   }
-  return (int)mlk_rej_uniform_asm(r, buf, buflen, mlk_rej_uniform_table);
+  return (int)mlk_rej_uniform_aarch64_asm(r, buf, buflen,
+                                          mlk_rej_uniform_table);
 }
 #endif /* !__ASSEMBLER__ */