From a41ce6abcb15747c3c5fa0c81c8a3bbcb43312cb Mon Sep 17 00:00:00 2001
From: Michael Baentsch <57787676+baentsch@users.noreply.github.com>
Date: Mon, 30 Oct 2023 06:39:59 +0100
Subject: [PATCH] enable several pqclean upstreams

---
 docs/algorithms/kem/kyber.md                  | 32 +++++++++----------
 docs/algorithms/kem/kyber.yml                 |  8 ++---
 docs/algorithms/sig/dilithium.md              | 32 +++++++++----------
 docs/algorithms/sig/dilithium.yml             |  8 ++---
 .../add_enable_by_alg.fragment                |  4 +--
 .../copy_from_upstream/copy_from_upstream.py  | 26 +++++----------
 .../copy_from_upstream/copy_from_upstream.yml | 19 ++++++++---
 .../src/kem/family/CMakeLists.txt             |  2 +-
 src/kem/kyber/CMakeLists.txt                  | 12 +++----
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_base_mul.S                          |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../cbd.c                                     |  0
 .../cbd.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../indcpa.c                                  |  0
 .../indcpa.h                                  |  0
 .../kem.c                                     |  0
 .../kem.h                                     |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../neon_poly.c                               |  0
 .../neon_polyvec.c                            |  0
 .../neon_symmetric-shake.c                    |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rejsample.c                               |  0
 .../rejsample.h                               |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 .../verify.c                                  |  0
 .../verify.h                                  |  0
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_base_mul.S                          |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../cbd.c                                     |  0
 .../cbd.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../indcpa.c                                  |  0
 .../indcpa.h                                  |  0
 .../kem.c                                     |  0
 .../kem.h                                     |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../neon_poly.c                               |  0
 .../neon_polyvec.c                            |  0
 .../neon_symmetric-shake.c                    |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rejsample.c                               |  0
 .../rejsample.h                               |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 .../verify.c                                  |  0
 .../verify.h                                  |  0
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_base_mul.S                          |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../cbd.c                                     |  0
 .../cbd.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../indcpa.c                                  |  0
 .../indcpa.h                                  |  0
 .../kem.c                                     |  0
 .../kem.h                                     |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../neon_poly.c                               |  0
 .../neon_polyvec.c                            |  0
 .../neon_symmetric-shake.c                    |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rejsample.c                               |  0
 .../rejsample.h                               |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 .../verify.c                                  |  0
 .../verify.h                                  |  0
 src/sig/dilithium/CMakeLists.txt              | 12 +++----
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../packing.c                                 |  0
 .../packing.h                                 |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rounding.c                                |  0
 .../rounding.h                                |  0
 .../sign.c                                    |  0
 .../sign.h                                    |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../packing.c                                 |  0
 .../packing.h                                 |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rounding.c                                |  0
 .../rounding.h                                |  0
 .../sign.c                                    |  0
 .../sign.h                                    |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 .../LICENSE                                   |  0
 .../NTT_params.h                              |  0
 .../__asm_NTT.S                               |  0
 .../__asm_iNTT.S                              |  0
 .../__asm_poly.S                              |  0
 .../api.h                                     |  0
 .../feat.S                                    |  0
 .../fips202x2.c                               |  0
 .../fips202x2.h                               |  0
 .../macros.inc                                |  0
 .../macros_common.inc                         |  0
 .../ntt.c                                     |  0
 .../ntt.h                                     |  0
 .../packing.c                                 |  0
 .../packing.h                                 |  0
 .../params.h                                  |  0
 .../poly.c                                    |  0
 .../poly.h                                    |  0
 .../polyvec.c                                 |  0
 .../polyvec.h                                 |  0
 .../reduce.c                                  |  0
 .../reduce.h                                  |  0
 .../rounding.c                                |  0
 .../rounding.h                                |  0
 .../sign.c                                    |  0
 .../sign.h                                    |  0
 .../symmetric-shake.c                         |  0
 .../symmetric.h                               |  0
 202 files changed, 78 insertions(+), 77 deletions(-)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/LICENSE (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/NTT_params.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/__asm_NTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/__asm_base_mul.S (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/__asm_iNTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/__asm_poly.S (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/api.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/cbd.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/cbd.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/feat.S (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/fips202x2.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/fips202x2.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/indcpa.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/indcpa.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/kem.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/kem.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/macros.inc (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/macros_common.inc (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/neon_poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/neon_polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/neon_symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/ntt.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/ntt.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/params.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/poly.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/polyvec.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/reduce.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/reduce.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/rejsample.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/rejsample.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/symmetric.h (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/verify.c (100%)
 rename src/kem/kyber/{pqclean_kyber1024_aarch64 => oldpqclean_kyber1024_aarch64}/verify.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/LICENSE (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/NTT_params.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/__asm_NTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/__asm_base_mul.S (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/__asm_iNTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/__asm_poly.S (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/api.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/cbd.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/cbd.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/feat.S (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/fips202x2.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/fips202x2.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/indcpa.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/indcpa.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/kem.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/kem.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/macros.inc (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/macros_common.inc (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/neon_poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/neon_polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/neon_symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/ntt.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/ntt.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/params.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/poly.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/polyvec.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/reduce.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/reduce.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/rejsample.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/rejsample.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/symmetric.h (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/verify.c (100%)
 rename src/kem/kyber/{pqclean_kyber512_aarch64 => oldpqclean_kyber512_aarch64}/verify.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/LICENSE (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/NTT_params.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/__asm_NTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/__asm_base_mul.S (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/__asm_iNTT.S (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/__asm_poly.S (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/api.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/cbd.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/cbd.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/feat.S (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/fips202x2.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/fips202x2.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/indcpa.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/indcpa.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/kem.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/kem.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/macros.inc (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/macros_common.inc (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/neon_poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/neon_polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/neon_symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/ntt.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/ntt.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/params.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/poly.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/poly.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/polyvec.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/polyvec.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/reduce.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/reduce.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/rejsample.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/rejsample.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/symmetric-shake.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/symmetric.h (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/verify.c (100%)
 rename src/kem/kyber/{pqclean_kyber768_aarch64 => oldpqclean_kyber768_aarch64}/verify.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/LICENSE (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/NTT_params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/__asm_NTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/__asm_iNTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/__asm_poly.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/api.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/feat.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/fips202x2.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/fips202x2.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/macros.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/macros_common.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/ntt.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/ntt.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/packing.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/packing.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/poly.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/poly.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/polyvec.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/polyvec.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/reduce.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/reduce.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/rounding.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/rounding.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/sign.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/sign.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/symmetric-shake.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium2_aarch64 => oldpqclean_dilithium2_aarch64}/symmetric.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/LICENSE (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/NTT_params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/__asm_NTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/__asm_iNTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/__asm_poly.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/api.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/feat.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/fips202x2.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/fips202x2.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/macros.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/macros_common.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/ntt.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/ntt.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/packing.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/packing.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/poly.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/poly.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/polyvec.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/polyvec.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/reduce.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/reduce.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/rounding.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/rounding.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/sign.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/sign.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/symmetric-shake.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium3_aarch64 => oldpqclean_dilithium3_aarch64}/symmetric.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/LICENSE (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/NTT_params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/__asm_NTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/__asm_iNTT.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/__asm_poly.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/api.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/feat.S (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/fips202x2.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/fips202x2.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/macros.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/macros_common.inc (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/ntt.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/ntt.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/packing.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/packing.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/params.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/poly.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/poly.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/polyvec.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/polyvec.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/reduce.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/reduce.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/rounding.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/rounding.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/sign.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/sign.h (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/symmetric-shake.c (100%)
 rename src/sig/dilithium/{pqclean_dilithium5_aarch64 => oldpqclean_dilithium5_aarch64}/symmetric.h (100%)

diff --git a/docs/algorithms/kem/kyber.md b/docs/algorithms/kem/kyber.md
index 2cfa4fc0c5..1595c38e9e 100644
--- a/docs/algorithms/kem/kyber.md
+++ b/docs/algorithms/kem/kyber.md
@@ -10,7 +10,7 @@
   - **Source**: https://github.com/pq-crystals/kyber/commit/518de2414a85052bb91349bcbcc347f391292d5b with copy_from_upstream patches
   - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0
 - **Optimized Implementation sources**: https://github.com/pq-crystals/kyber/commit/518de2414a85052bb91349bcbcc347f391292d5b with copy_from_upstream patches
-  - **pqclean-aarch64**:<a name="pqclean-aarch64"></a>
+  - **oldpqclean-aarch64**:<a name="oldpqclean-aarch64"></a>
       - **Source**: https://github.com/PQClean/PQClean/commit/8e220a87308154d48fdfac40abbb191ac7fce06a with copy_from_upstream patches
       - **Implementation license (SPDX-Identifier)**: CC0-1.0 and (CC0-1.0 or Apache-2.0) and (CC0-1.0 or MIT) and MIT
 
@@ -25,11 +25,11 @@
 
 ## Kyber512 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?‡   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:----------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                 |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                 |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                 |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?‡   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:----------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                 |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                 |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                 |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
@@ -37,21 +37,21 @@ Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
 ## Kyber768 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
 ## Kyber1024 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Linux,Darwin                    | AVX2,BMI2,POPCNT        | True                               | True                                           | False                |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
diff --git a/docs/algorithms/kem/kyber.yml b/docs/algorithms/kem/kyber.yml
index 5a0fda9ca1..46db8a0161 100644
--- a/docs/algorithms/kem/kyber.yml
+++ b/docs/algorithms/kem/kyber.yml
@@ -21,7 +21,7 @@ primary-upstream:
     with copy_from_upstream patches
   spdx-license-identifier: CC0-1.0 or Apache-2.0
 optimized-upstreams:
-  pqclean-aarch64:
+  oldpqclean-aarch64:
     source: https://github.com/PQClean/PQClean/commit/8e220a87308154d48fdfac40abbb191ac7fce06a
       with copy_from_upstream patches
     spdx-license-identifier: CC0-1.0 and (CC0-1.0 or Apache-2.0) and (CC0-1.0 or MIT)
@@ -60,7 +60,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
@@ -105,7 +105,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
@@ -150,7 +150,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
diff --git a/docs/algorithms/sig/dilithium.md b/docs/algorithms/sig/dilithium.md
index b369a0ce14..cd4ecb7336 100644
--- a/docs/algorithms/sig/dilithium.md
+++ b/docs/algorithms/sig/dilithium.md
@@ -10,7 +10,7 @@
   - **Source**: https://github.com/pq-crystals/dilithium/commit/3e9b9f1412f6c7435dbeb4e10692ea58f181ee51 with copy_from_upstream patches
   - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0
 - **Optimized Implementation sources**: https://github.com/pq-crystals/dilithium/commit/3e9b9f1412f6c7435dbeb4e10692ea58f181ee51 with copy_from_upstream patches
-  - **pqclean-aarch64**:<a name="pqclean-aarch64"></a>
+  - **oldpqclean-aarch64**:<a name="oldpqclean-aarch64"></a>
       - **Source**: https://github.com/PQClean/PQClean/commit/8e220a87308154d48fdfac40abbb191ac7fce06a with copy_from_upstream patches
       - **Implementation license (SPDX-Identifier)**: CC0-1.0 and (CC0-1.0 or Apache-2.0) and (CC0-1.0 or MIT) and MIT
 
@@ -25,11 +25,11 @@
 
 ## Dilithium2 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?‡   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:----------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                 |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                 |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                 |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?‡   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:----------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                 |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                 |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                 |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
@@ -37,21 +37,21 @@ Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
 ## Dilithium3 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
 ## Dilithium5 implementation characteristics
 
-|        Implementation source        | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
-|:-----------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
-|  [Primary Source](#primary-source)  | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
-|  [Primary Source](#primary-source)  | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                |
-| [pqclean-aarch64](#pqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
+|           Implementation source           | Identifier in upstream   | Supported architecture(s)   | Supported operating system(s)   | CPU extension(s) used   | No branching-on-secrets claimed?   | No branching-on-secrets checked by valgrind?   | Large stack usage?   |
+|:-----------------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------|
+|     [Primary Source](#primary-source)     | ref                      | All                         | All                             | None                    | True                               | True                                           | False                |
+|     [Primary Source](#primary-source)     | avx2                     | x86\_64                     | Darwin,Linux                    | AVX2,POPCNT             | True                               | True                                           | False                |
+| [oldpqclean-aarch64](#oldpqclean-aarch64) | aarch64                  | ARM64\_V8                   | Linux,Darwin                    | None                    | True                               | False                                          | False                |
 
 Are implementations chosen based on runtime CPU feature detection? **Yes**.
 
diff --git a/docs/algorithms/sig/dilithium.yml b/docs/algorithms/sig/dilithium.yml
index dc92c1eb1e..7c0fe3280d 100644
--- a/docs/algorithms/sig/dilithium.yml
+++ b/docs/algorithms/sig/dilithium.yml
@@ -19,7 +19,7 @@ primary-upstream:
     with copy_from_upstream patches
   spdx-license-identifier: CC0-1.0 or Apache-2.0
 optimized-upstreams:
-  pqclean-aarch64:
+  oldpqclean-aarch64:
     source: https://github.com/PQClean/PQClean/commit/8e220a87308154d48fdfac40abbb191ac7fce06a
       with copy_from_upstream patches
     spdx-license-identifier: CC0-1.0 and (CC0-1.0 or Apache-2.0) and (CC0-1.0 or MIT)
@@ -57,7 +57,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
@@ -101,7 +101,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
@@ -145,7 +145,7 @@ parameter-sets:
     no-secret-dependent-branching-claimed: true
     no-secret-dependent-branching-checked-by-valgrind: true
     large-stack-usage: false
-  - upstream: pqclean-aarch64
+  - upstream: oldpqclean-aarch64
     upstream-id: aarch64
     supported-platforms:
     - architecture: ARM64_V8
diff --git a/scripts/copy_from_upstream/.CMake/alg_support.cmake/add_enable_by_alg.fragment b/scripts/copy_from_upstream/.CMake/alg_support.cmake/add_enable_by_alg.fragment
index 5a2c46901d..b600b1e51f 100644
--- a/scripts/copy_from_upstream/.CMake/alg_support.cmake/add_enable_by_alg.fragment
+++ b/scripts/copy_from_upstream/.CMake/alg_support.cmake/add_enable_by_alg.fragment
@@ -16,11 +16,11 @@ endif()
 {% if platform['operating_systems'] %}if(CMAKE_SYSTEM_NAME MATCHES "{{ platform['operating_systems']|join('|') }}")
 {% endif -%}
 if((OQS_DIST_ARM64_V8_BUILD OR (OQS_USE_ARM_NEON_INSTRUCTIONS{% for flag in platform['required_flags'] -%} {%- if not loop.last or loop.first %} AND {% endif -%}OQS_USE_{{ flag|upper }}_INSTRUCTIONS {%- endfor -%})))
-{% if impl['upstream']['name'] == 'pqclean' -%}
+{% if impl['upstream']['name'].endswith('pqclean') -%}
 if(((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "9.4.0")) OR ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "9.4.0")) OR ((NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU")) AND (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))))
 {%- endif %}
     cmake_dependent_option(OQS_ENABLE_KEM_{{ family['name'] }}_{{ scheme['scheme'] }}_{{ impl['name']  }} "" ON "OQS_ENABLE_KEM_{{ family['name'] }}_{{ scheme['scheme'] }}" OFF)
-{% if impl['upstream']['name'] == 'pqclean' -%}
+{% if impl['upstream']['name'].endswith('pqclean') -%}
 else()
     message(WARNING "  ARM optimizations are not fully supported on this compiler version.")
 endif()
diff --git a/scripts/copy_from_upstream/copy_from_upstream.py b/scripts/copy_from_upstream/copy_from_upstream.py
index 92264fb1bb..bf871d5692 100755
--- a/scripts/copy_from_upstream/copy_from_upstream.py
+++ b/scripts/copy_from_upstream/copy_from_upstream.py
@@ -104,7 +104,6 @@ def load_instructions():
     instructions = yaml.safe_load(instructions)
     upstreams = {}
     for upstream in instructions['upstreams']:
-        os.makedirs('repos', exist_ok=True)
         upstream_name = upstream['name']
         upstream_git_url = upstream['git_url']
         upstream_git_commit = upstream['git_commit']
@@ -113,13 +112,16 @@ def load_instructions():
 
         work_dir = os.path.join('repos', upstream_name)
         work_dotgit = os.path.join(work_dir, '.git')
-        if not os.path.exists(work_dotgit):
+
+        if not os.path.exists(work_dir):
+          os.makedirs(work_dir)
+          if not os.path.exists(work_dotgit):
             shell(['git', 'init', work_dir])
             shell(['git', '--git-dir', work_dotgit, 'remote', 'add', 'origin', upstream_git_url])
-        shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'remote', 'set-url', 'origin', upstream_git_url])
-        shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'fetch', '--depth=1', 'origin', upstream_git_commit])
-        shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'reset', '--hard', upstream_git_commit])
-        if 'patches' in upstream:
+          shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'remote', 'set-url', 'origin', upstream_git_url])
+          shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'fetch', '--depth=1', 'origin', upstream_git_commit])
+          shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'reset', '--hard', upstream_git_commit])
+          if 'patches' in upstream:
             for patch in upstream['patches']:
                 patch_file = os.path.join('patches', patch)
                 shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'apply', '--whitespace=fix', '--directory', work_dir, patch_file])
@@ -142,16 +144,6 @@ def load_instructions():
                         common_dep['required_flags'] = req['required_flags']
             upstream['commons'] = dict(map(lambda x: (x['name'], x), common_deps['commons'] ))
 
-    # drop instructions selectively if not ready
-    if ("NOT_READY" in os.environ):
-        not_ready = os.environ['NOT_READY'].split(" ")
-        for family in instructions['kems']:
-            if family['name'] in not_ready:
-                instructions["kems"].remove(family)
-        for family in instructions['sigs']:
-            if family['name'] in not_ready:
-                instructions["sigs"].remove(family)
-
     for family in instructions['kems']:
         family['type'] = 'kem'
         family['pqclean_type'] = 'kem'
@@ -619,11 +611,9 @@ def copy_from_upstream():
     import update_cbom
     update_docs_from_yaml.do_it(os.environ['LIBOQS_DIR'])
     update_cbom.update_cbom_if_algs_not_changed(os.environ['LIBOQS_DIR'], "git")
-
     if not keepdata:
         shutil.rmtree('repos')
 
-
 def verify_from_upstream():
     instructions = load_instructions()
     basedir = "verify_from_upstream"
diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml
index 7c83c2d770..a614dc0997 100644
--- a/scripts/copy_from_upstream/copy_from_upstream.yml
+++ b/scripts/copy_from_upstream/copy_from_upstream.yml
@@ -1,6 +1,6 @@
 upstreams:
   -
-    name: pqclean
+    name: oldpqclean
     git_url: https://github.com/PQClean/PQClean.git
     git_branch: master
     git_commit: 8e220a87308154d48fdfac40abbb191ac7fce06a
@@ -8,8 +8,19 @@ upstreams:
     sig_meta_path: 'crypto_sign/{pqclean_scheme}/META.yml'
     kem_scheme_path: 'crypto_kem/{pqclean_scheme}'
     sig_scheme_path: 'crypto_sign/{pqclean_scheme}'
-    patches: [pqclean-sphincs.patch, pqclean-dilithium-arm-randomized-signing.patch, pqclean-kyber-armneon-shake-fixes.patch, pqclean-kyber-armneon-768-1024-fixes.patch]
+    patches: [pqclean-dilithium-arm-randomized-signing.patch, pqclean-kyber-armneon-shake-fixes.patch, pqclean-kyber-armneon-768-1024-fixes.patch]
     ignore: pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256f-simple_aarch64, pqclean_sphincs-shake-192s-simple_aarch64, pqclean_sphincs-shake-192f-simple_aarch64, pqclean_sphincs-shake-128s-simple_aarch64, pqclean_sphincs-shake-128f-simple_aarch64
+  -
+    name: pqclean
+    git_url: https://github.com/PQClean/PQClean.git
+    git_branch: master
+    git_commit: 8e220a87308154d48fdfac40abbb191ac7fce06a
+    kem_meta_path: 'crypto_kem/{pqclean_scheme}/META.yml'
+    sig_meta_path: 'crypto_sign/{pqclean_scheme}/META.yml'
+    kem_scheme_path: 'crypto_kem/{pqclean_scheme}'
+    sig_scheme_path: 'crypto_sign/{pqclean_scheme}'
+    patches: [pqclean-sphincs.patch]
+    ignore: pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256f-simple_aarch64, pqclean_sphincs-shake-192s-simple_aarch64, pqclean_sphincs-shake-192f-simple_aarch64, pqclean_sphincs-shake-128s-simple_aarch64, pqclean_sphincs-shake-128f-simple_aarch64, pqclean_kyber512_aarch64, pqclean_kyber1024_aarch64, pqclean_kyber768_aarch64, pqclean_dilithium2_aarch64, pqclean_dilithium3_aarch64, pqclean_dilithium5_aarch64
   -
     name: pqcrystals-kyber
     git_url: https://github.com/pq-crystals/kyber.git
@@ -96,7 +107,7 @@ kems:
                                       aarch64: aarch64
     upstream_location: pqcrystals-kyber
     arch_specific_upstream_locations:
-                                      aarch64: pqclean
+                                      aarch64: oldpqclean
     schemes:
       -
         scheme: "512"
@@ -118,7 +129,7 @@ sigs:
     arch_specific_implementations:
                                       aarch64: aarch64
     arch_specific_upstream_locations:
-                                      aarch64: pqclean
+                                      aarch64: oldpqclean
     schemes:
       -
         scheme: "2"
diff --git a/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt b/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt
index 8fa179c804..1bf89c5866 100644
--- a/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt
+++ b/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt
@@ -55,7 +55,7 @@ if(OQS_ENABLE_KEM_{{ family }}_{{ scheme['scheme_c'] }}_{{ impl['name'] }})
         {%- if family == 'hqc' and impl['name'] == 'avx2' %}
     target_compile_options({{ family }}_{{ scheme['scheme'] }}_{{ impl['name'] }} PRIVATE -Wno-missing-braces)
         {%- endif %}
-        {%- if impl['upstream']['name'] == 'pqclean' %}
+        {%- if impl['upstream']['name'].endswith('pqclean') %}
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         target_compile_definitions({{ family }}_{{ scheme['scheme'] }}_{{ impl['name'] }} PRIVATE old_gas_syntax)
     endif()
diff --git a/src/kem/kyber/CMakeLists.txt b/src/kem/kyber/CMakeLists.txt
index 5498547007..948fc0880c 100644
--- a/src/kem/kyber/CMakeLists.txt
+++ b/src/kem/kyber/CMakeLists.txt
@@ -24,8 +24,8 @@ if(OQS_ENABLE_KEM_kyber_512_avx2)
 endif()
 
 if(OQS_ENABLE_KEM_kyber_512_aarch64)
-    add_library(kyber_512_aarch64 OBJECT pqclean_kyber512_aarch64/__asm_base_mul.S pqclean_kyber512_aarch64/__asm_iNTT.S pqclean_kyber512_aarch64/__asm_NTT.S pqclean_kyber512_aarch64/__asm_poly.S pqclean_kyber512_aarch64/cbd.c pqclean_kyber512_aarch64/feat.S pqclean_kyber512_aarch64/fips202x2.c pqclean_kyber512_aarch64/indcpa.c pqclean_kyber512_aarch64/kem.c pqclean_kyber512_aarch64/neon_poly.c pqclean_kyber512_aarch64/neon_polyvec.c pqclean_kyber512_aarch64/neon_symmetric-shake.c pqclean_kyber512_aarch64/ntt.c pqclean_kyber512_aarch64/poly.c pqclean_kyber512_aarch64/polyvec.c pqclean_kyber512_aarch64/reduce.c pqclean_kyber512_aarch64/rejsample.c pqclean_kyber512_aarch64/symmetric-shake.c pqclean_kyber512_aarch64/verify.c)
-    target_include_directories(kyber_512_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber512_aarch64)
+    add_library(kyber_512_aarch64 OBJECT oldpqclean_kyber512_aarch64/__asm_base_mul.S oldpqclean_kyber512_aarch64/__asm_iNTT.S oldpqclean_kyber512_aarch64/__asm_NTT.S oldpqclean_kyber512_aarch64/__asm_poly.S oldpqclean_kyber512_aarch64/cbd.c oldpqclean_kyber512_aarch64/feat.S oldpqclean_kyber512_aarch64/fips202x2.c oldpqclean_kyber512_aarch64/indcpa.c oldpqclean_kyber512_aarch64/kem.c oldpqclean_kyber512_aarch64/neon_poly.c oldpqclean_kyber512_aarch64/neon_polyvec.c oldpqclean_kyber512_aarch64/neon_symmetric-shake.c oldpqclean_kyber512_aarch64/ntt.c oldpqclean_kyber512_aarch64/poly.c oldpqclean_kyber512_aarch64/polyvec.c oldpqclean_kyber512_aarch64/reduce.c oldpqclean_kyber512_aarch64/rejsample.c oldpqclean_kyber512_aarch64/symmetric-shake.c oldpqclean_kyber512_aarch64/verify.c)
+    target_include_directories(kyber_512_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_kyber512_aarch64)
     target_include_directories(kyber_512_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         target_compile_definitions(kyber_512_aarch64 PRIVATE old_gas_syntax)
@@ -52,8 +52,8 @@ if(OQS_ENABLE_KEM_kyber_768_avx2)
 endif()
 
 if(OQS_ENABLE_KEM_kyber_768_aarch64)
-    add_library(kyber_768_aarch64 OBJECT pqclean_kyber768_aarch64/__asm_base_mul.S pqclean_kyber768_aarch64/__asm_iNTT.S pqclean_kyber768_aarch64/__asm_NTT.S pqclean_kyber768_aarch64/__asm_poly.S pqclean_kyber768_aarch64/cbd.c pqclean_kyber768_aarch64/feat.S pqclean_kyber768_aarch64/fips202x2.c pqclean_kyber768_aarch64/indcpa.c pqclean_kyber768_aarch64/kem.c pqclean_kyber768_aarch64/neon_poly.c pqclean_kyber768_aarch64/neon_polyvec.c pqclean_kyber768_aarch64/neon_symmetric-shake.c pqclean_kyber768_aarch64/ntt.c pqclean_kyber768_aarch64/poly.c pqclean_kyber768_aarch64/polyvec.c pqclean_kyber768_aarch64/reduce.c pqclean_kyber768_aarch64/rejsample.c pqclean_kyber768_aarch64/symmetric-shake.c pqclean_kyber768_aarch64/verify.c)
-    target_include_directories(kyber_768_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber768_aarch64)
+    add_library(kyber_768_aarch64 OBJECT oldpqclean_kyber768_aarch64/__asm_base_mul.S oldpqclean_kyber768_aarch64/__asm_iNTT.S oldpqclean_kyber768_aarch64/__asm_NTT.S oldpqclean_kyber768_aarch64/__asm_poly.S oldpqclean_kyber768_aarch64/cbd.c oldpqclean_kyber768_aarch64/feat.S oldpqclean_kyber768_aarch64/fips202x2.c oldpqclean_kyber768_aarch64/indcpa.c oldpqclean_kyber768_aarch64/kem.c oldpqclean_kyber768_aarch64/neon_poly.c oldpqclean_kyber768_aarch64/neon_polyvec.c oldpqclean_kyber768_aarch64/neon_symmetric-shake.c oldpqclean_kyber768_aarch64/ntt.c oldpqclean_kyber768_aarch64/poly.c oldpqclean_kyber768_aarch64/polyvec.c oldpqclean_kyber768_aarch64/reduce.c oldpqclean_kyber768_aarch64/rejsample.c oldpqclean_kyber768_aarch64/symmetric-shake.c oldpqclean_kyber768_aarch64/verify.c)
+    target_include_directories(kyber_768_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_kyber768_aarch64)
     target_include_directories(kyber_768_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         target_compile_definitions(kyber_768_aarch64 PRIVATE old_gas_syntax)
@@ -80,8 +80,8 @@ if(OQS_ENABLE_KEM_kyber_1024_avx2)
 endif()
 
 if(OQS_ENABLE_KEM_kyber_1024_aarch64)
-    add_library(kyber_1024_aarch64 OBJECT pqclean_kyber1024_aarch64/__asm_base_mul.S pqclean_kyber1024_aarch64/__asm_iNTT.S pqclean_kyber1024_aarch64/__asm_NTT.S pqclean_kyber1024_aarch64/__asm_poly.S pqclean_kyber1024_aarch64/cbd.c pqclean_kyber1024_aarch64/feat.S pqclean_kyber1024_aarch64/fips202x2.c pqclean_kyber1024_aarch64/indcpa.c pqclean_kyber1024_aarch64/kem.c pqclean_kyber1024_aarch64/neon_poly.c pqclean_kyber1024_aarch64/neon_polyvec.c pqclean_kyber1024_aarch64/neon_symmetric-shake.c pqclean_kyber1024_aarch64/ntt.c pqclean_kyber1024_aarch64/poly.c pqclean_kyber1024_aarch64/polyvec.c pqclean_kyber1024_aarch64/reduce.c pqclean_kyber1024_aarch64/rejsample.c pqclean_kyber1024_aarch64/symmetric-shake.c pqclean_kyber1024_aarch64/verify.c)
-    target_include_directories(kyber_1024_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber1024_aarch64)
+    add_library(kyber_1024_aarch64 OBJECT oldpqclean_kyber1024_aarch64/__asm_base_mul.S oldpqclean_kyber1024_aarch64/__asm_iNTT.S oldpqclean_kyber1024_aarch64/__asm_NTT.S oldpqclean_kyber1024_aarch64/__asm_poly.S oldpqclean_kyber1024_aarch64/cbd.c oldpqclean_kyber1024_aarch64/feat.S oldpqclean_kyber1024_aarch64/fips202x2.c oldpqclean_kyber1024_aarch64/indcpa.c oldpqclean_kyber1024_aarch64/kem.c oldpqclean_kyber1024_aarch64/neon_poly.c oldpqclean_kyber1024_aarch64/neon_polyvec.c oldpqclean_kyber1024_aarch64/neon_symmetric-shake.c oldpqclean_kyber1024_aarch64/ntt.c oldpqclean_kyber1024_aarch64/poly.c oldpqclean_kyber1024_aarch64/polyvec.c oldpqclean_kyber1024_aarch64/reduce.c oldpqclean_kyber1024_aarch64/rejsample.c oldpqclean_kyber1024_aarch64/symmetric-shake.c oldpqclean_kyber1024_aarch64/verify.c)
+    target_include_directories(kyber_1024_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_kyber1024_aarch64)
     target_include_directories(kyber_1024_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         target_compile_definitions(kyber_1024_aarch64 PRIVATE old_gas_syntax)
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/LICENSE b/src/kem/kyber/oldpqclean_kyber1024_aarch64/LICENSE
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/LICENSE
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/LICENSE
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/NTT_params.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/NTT_params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/NTT_params.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/NTT_params.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S b/src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_NTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_NTT.S
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S b/src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_base_mul.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_base_mul.S
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S b/src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_iNTT.S
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S b/src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_poly.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/__asm_poly.S
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/api.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/api.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/api.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/api.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/cbd.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/cbd.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/cbd.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/cbd.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/cbd.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/cbd.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/cbd.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/cbd.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/feat.S b/src/kem/kyber/oldpqclean_kyber1024_aarch64/feat.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/feat.S
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/feat.S
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/fips202x2.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/fips202x2.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/fips202x2.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/fips202x2.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/fips202x2.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/fips202x2.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/fips202x2.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/fips202x2.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/indcpa.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/indcpa.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/indcpa.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/indcpa.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/indcpa.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/indcpa.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/indcpa.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/indcpa.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/kem.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/kem.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/kem.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/kem.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/kem.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/kem.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/kem.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/kem.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/macros.inc b/src/kem/kyber/oldpqclean_kyber1024_aarch64/macros.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/macros.inc
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/macros.inc
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/macros_common.inc b/src/kem/kyber/oldpqclean_kyber1024_aarch64/macros_common.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/macros_common.inc
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/macros_common.inc
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/neon_poly.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/neon_poly.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_poly.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/neon_polyvec.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/neon_polyvec.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/neon_symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/neon_symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/ntt.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/ntt.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/ntt.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/ntt.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/ntt.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/ntt.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/ntt.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/ntt.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/params.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/params.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/params.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/poly.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/poly.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/poly.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/poly.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/poly.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/poly.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/poly.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/polyvec.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/polyvec.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/polyvec.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/polyvec.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/polyvec.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/polyvec.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/reduce.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/reduce.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/reduce.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/reduce.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/reduce.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/reduce.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/reduce.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/reduce.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/rejsample.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/rejsample.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/rejsample.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/rejsample.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/rejsample.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/rejsample.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/rejsample.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/rejsample.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/symmetric.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/symmetric.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/symmetric.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/symmetric.h
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/verify.c b/src/kem/kyber/oldpqclean_kyber1024_aarch64/verify.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/verify.c
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/verify.c
diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/verify.h b/src/kem/kyber/oldpqclean_kyber1024_aarch64/verify.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber1024_aarch64/verify.h
rename to src/kem/kyber/oldpqclean_kyber1024_aarch64/verify.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/LICENSE b/src/kem/kyber/oldpqclean_kyber512_aarch64/LICENSE
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/LICENSE
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/LICENSE
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/NTT_params.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/NTT_params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/NTT_params.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/NTT_params.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S b/src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_NTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_NTT.S
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S b/src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_base_mul.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_base_mul.S
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S b/src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_iNTT.S
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S b/src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_poly.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/__asm_poly.S
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/api.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/api.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/api.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/api.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/cbd.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/cbd.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/cbd.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/cbd.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/cbd.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/cbd.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/cbd.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/cbd.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/feat.S b/src/kem/kyber/oldpqclean_kyber512_aarch64/feat.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/feat.S
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/feat.S
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/fips202x2.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/fips202x2.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/fips202x2.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/fips202x2.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/fips202x2.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/fips202x2.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/fips202x2.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/fips202x2.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/indcpa.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/indcpa.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/indcpa.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/indcpa.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/indcpa.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/indcpa.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/indcpa.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/indcpa.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/kem.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/kem.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/kem.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/kem.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/kem.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/kem.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/kem.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/kem.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/macros.inc b/src/kem/kyber/oldpqclean_kyber512_aarch64/macros.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/macros.inc
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/macros.inc
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/macros_common.inc b/src/kem/kyber/oldpqclean_kyber512_aarch64/macros_common.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/macros_common.inc
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/macros_common.inc
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/neon_poly.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/neon_poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/neon_poly.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/neon_poly.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/neon_polyvec.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/neon_polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/neon_polyvec.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/neon_polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/neon_symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/neon_symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/neon_symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/neon_symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/ntt.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/ntt.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/ntt.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/ntt.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/ntt.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/ntt.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/ntt.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/ntt.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/params.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/params.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/params.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/poly.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/poly.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/poly.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/poly.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/poly.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/poly.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/poly.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/polyvec.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/polyvec.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/polyvec.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/polyvec.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/polyvec.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/polyvec.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/reduce.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/reduce.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/reduce.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/reduce.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/reduce.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/reduce.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/reduce.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/reduce.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/rejsample.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/rejsample.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/rejsample.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/rejsample.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/rejsample.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/rejsample.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/rejsample.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/rejsample.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/symmetric.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/symmetric.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/symmetric.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/symmetric.h
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/verify.c b/src/kem/kyber/oldpqclean_kyber512_aarch64/verify.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/verify.c
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/verify.c
diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/verify.h b/src/kem/kyber/oldpqclean_kyber512_aarch64/verify.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber512_aarch64/verify.h
rename to src/kem/kyber/oldpqclean_kyber512_aarch64/verify.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/LICENSE b/src/kem/kyber/oldpqclean_kyber768_aarch64/LICENSE
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/LICENSE
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/LICENSE
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/NTT_params.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/NTT_params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/NTT_params.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/NTT_params.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S b/src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_NTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_NTT.S
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S b/src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_base_mul.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_base_mul.S
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S b/src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_iNTT.S
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S b/src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_poly.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/__asm_poly.S
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/api.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/api.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/api.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/api.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/cbd.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/cbd.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/cbd.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/cbd.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/cbd.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/cbd.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/cbd.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/cbd.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/feat.S b/src/kem/kyber/oldpqclean_kyber768_aarch64/feat.S
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/feat.S
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/feat.S
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/fips202x2.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/fips202x2.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/fips202x2.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/fips202x2.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/fips202x2.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/fips202x2.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/fips202x2.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/fips202x2.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/indcpa.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/indcpa.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/indcpa.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/indcpa.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/indcpa.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/indcpa.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/indcpa.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/indcpa.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/kem.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/kem.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/kem.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/kem.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/kem.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/kem.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/kem.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/kem.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/macros.inc b/src/kem/kyber/oldpqclean_kyber768_aarch64/macros.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/macros.inc
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/macros.inc
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/macros_common.inc b/src/kem/kyber/oldpqclean_kyber768_aarch64/macros_common.inc
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/macros_common.inc
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/macros_common.inc
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/neon_poly.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/neon_poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/neon_poly.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/neon_poly.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/neon_polyvec.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/neon_polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/neon_polyvec.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/neon_polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/neon_symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/neon_symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/neon_symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/neon_symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/ntt.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/ntt.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/ntt.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/ntt.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/ntt.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/ntt.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/ntt.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/ntt.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/params.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/params.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/params.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/params.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/poly.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/poly.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/poly.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/poly.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/poly.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/poly.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/poly.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/poly.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/polyvec.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/polyvec.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/polyvec.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/polyvec.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/polyvec.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/polyvec.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/polyvec.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/polyvec.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/reduce.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/reduce.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/reduce.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/reduce.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/reduce.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/reduce.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/reduce.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/reduce.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/rejsample.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/rejsample.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/rejsample.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/rejsample.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/rejsample.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/rejsample.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/rejsample.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/rejsample.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/symmetric-shake.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/symmetric-shake.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/symmetric-shake.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/symmetric-shake.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/symmetric.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/symmetric.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/symmetric.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/symmetric.h
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/verify.c b/src/kem/kyber/oldpqclean_kyber768_aarch64/verify.c
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/verify.c
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/verify.c
diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/verify.h b/src/kem/kyber/oldpqclean_kyber768_aarch64/verify.h
similarity index 100%
rename from src/kem/kyber/pqclean_kyber768_aarch64/verify.h
rename to src/kem/kyber/oldpqclean_kyber768_aarch64/verify.h
diff --git a/src/sig/dilithium/CMakeLists.txt b/src/sig/dilithium/CMakeLists.txt
index 2dff86f523..47a216a623 100644
--- a/src/sig/dilithium/CMakeLists.txt
+++ b/src/sig/dilithium/CMakeLists.txt
@@ -24,8 +24,8 @@ if(OQS_ENABLE_SIG_dilithium_2_avx2)
 endif()
 
 if(OQS_ENABLE_SIG_dilithium_2_aarch64)
-    add_library(dilithium_2_aarch64 OBJECT pqclean_dilithium2_aarch64/__asm_iNTT.S pqclean_dilithium2_aarch64/__asm_NTT.S pqclean_dilithium2_aarch64/__asm_poly.S pqclean_dilithium2_aarch64/feat.S pqclean_dilithium2_aarch64/fips202x2.c pqclean_dilithium2_aarch64/ntt.c pqclean_dilithium2_aarch64/packing.c pqclean_dilithium2_aarch64/poly.c pqclean_dilithium2_aarch64/polyvec.c pqclean_dilithium2_aarch64/reduce.c pqclean_dilithium2_aarch64/rounding.c pqclean_dilithium2_aarch64/sign.c pqclean_dilithium2_aarch64/symmetric-shake.c)
-    target_include_directories(dilithium_2_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_dilithium2_aarch64)
+    add_library(dilithium_2_aarch64 OBJECT oldpqclean_dilithium2_aarch64/__asm_iNTT.S oldpqclean_dilithium2_aarch64/__asm_NTT.S oldpqclean_dilithium2_aarch64/__asm_poly.S oldpqclean_dilithium2_aarch64/feat.S oldpqclean_dilithium2_aarch64/fips202x2.c oldpqclean_dilithium2_aarch64/ntt.c oldpqclean_dilithium2_aarch64/packing.c oldpqclean_dilithium2_aarch64/poly.c oldpqclean_dilithium2_aarch64/polyvec.c oldpqclean_dilithium2_aarch64/reduce.c oldpqclean_dilithium2_aarch64/rounding.c oldpqclean_dilithium2_aarch64/sign.c oldpqclean_dilithium2_aarch64/symmetric-shake.c)
+    target_include_directories(dilithium_2_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_dilithium2_aarch64)
     target_include_directories(dilithium_2_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(dilithium_2_aarch64 PRIVATE)
     set(_DILITHIUM_OBJS ${_DILITHIUM_OBJS} $<TARGET_OBJECTS:dilithium_2_aarch64>)
@@ -50,8 +50,8 @@ if(OQS_ENABLE_SIG_dilithium_3_avx2)
 endif()
 
 if(OQS_ENABLE_SIG_dilithium_3_aarch64)
-    add_library(dilithium_3_aarch64 OBJECT pqclean_dilithium3_aarch64/__asm_iNTT.S pqclean_dilithium3_aarch64/__asm_NTT.S pqclean_dilithium3_aarch64/__asm_poly.S pqclean_dilithium3_aarch64/feat.S pqclean_dilithium3_aarch64/fips202x2.c pqclean_dilithium3_aarch64/ntt.c pqclean_dilithium3_aarch64/packing.c pqclean_dilithium3_aarch64/poly.c pqclean_dilithium3_aarch64/polyvec.c pqclean_dilithium3_aarch64/reduce.c pqclean_dilithium3_aarch64/rounding.c pqclean_dilithium3_aarch64/sign.c pqclean_dilithium3_aarch64/symmetric-shake.c)
-    target_include_directories(dilithium_3_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_dilithium3_aarch64)
+    add_library(dilithium_3_aarch64 OBJECT oldpqclean_dilithium3_aarch64/__asm_iNTT.S oldpqclean_dilithium3_aarch64/__asm_NTT.S oldpqclean_dilithium3_aarch64/__asm_poly.S oldpqclean_dilithium3_aarch64/feat.S oldpqclean_dilithium3_aarch64/fips202x2.c oldpqclean_dilithium3_aarch64/ntt.c oldpqclean_dilithium3_aarch64/packing.c oldpqclean_dilithium3_aarch64/poly.c oldpqclean_dilithium3_aarch64/polyvec.c oldpqclean_dilithium3_aarch64/reduce.c oldpqclean_dilithium3_aarch64/rounding.c oldpqclean_dilithium3_aarch64/sign.c oldpqclean_dilithium3_aarch64/symmetric-shake.c)
+    target_include_directories(dilithium_3_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_dilithium3_aarch64)
     target_include_directories(dilithium_3_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(dilithium_3_aarch64 PRIVATE)
     set(_DILITHIUM_OBJS ${_DILITHIUM_OBJS} $<TARGET_OBJECTS:dilithium_3_aarch64>)
@@ -76,8 +76,8 @@ if(OQS_ENABLE_SIG_dilithium_5_avx2)
 endif()
 
 if(OQS_ENABLE_SIG_dilithium_5_aarch64)
-    add_library(dilithium_5_aarch64 OBJECT pqclean_dilithium5_aarch64/__asm_iNTT.S pqclean_dilithium5_aarch64/__asm_NTT.S pqclean_dilithium5_aarch64/__asm_poly.S pqclean_dilithium5_aarch64/feat.S pqclean_dilithium5_aarch64/fips202x2.c pqclean_dilithium5_aarch64/ntt.c pqclean_dilithium5_aarch64/packing.c pqclean_dilithium5_aarch64/poly.c pqclean_dilithium5_aarch64/polyvec.c pqclean_dilithium5_aarch64/reduce.c pqclean_dilithium5_aarch64/rounding.c pqclean_dilithium5_aarch64/sign.c pqclean_dilithium5_aarch64/symmetric-shake.c)
-    target_include_directories(dilithium_5_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_dilithium5_aarch64)
+    add_library(dilithium_5_aarch64 OBJECT oldpqclean_dilithium5_aarch64/__asm_iNTT.S oldpqclean_dilithium5_aarch64/__asm_NTT.S oldpqclean_dilithium5_aarch64/__asm_poly.S oldpqclean_dilithium5_aarch64/feat.S oldpqclean_dilithium5_aarch64/fips202x2.c oldpqclean_dilithium5_aarch64/ntt.c oldpqclean_dilithium5_aarch64/packing.c oldpqclean_dilithium5_aarch64/poly.c oldpqclean_dilithium5_aarch64/polyvec.c oldpqclean_dilithium5_aarch64/reduce.c oldpqclean_dilithium5_aarch64/rounding.c oldpqclean_dilithium5_aarch64/sign.c oldpqclean_dilithium5_aarch64/symmetric-shake.c)
+    target_include_directories(dilithium_5_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/oldpqclean_dilithium5_aarch64)
     target_include_directories(dilithium_5_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(dilithium_5_aarch64 PRIVATE)
     set(_DILITHIUM_OBJS ${_DILITHIUM_OBJS} $<TARGET_OBJECTS:dilithium_5_aarch64>)
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/LICENSE b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/LICENSE
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/LICENSE
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/LICENSE
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/NTT_params.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/NTT_params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/NTT_params.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/NTT_params.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_NTT.S b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_NTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_NTT.S
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_NTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_iNTT.S b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_iNTT.S
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_iNTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_poly.S b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_poly.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/__asm_poly.S
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/__asm_poly.S
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/api.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/api.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/api.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/api.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/feat.S b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/feat.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/feat.S
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/feat.S
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/fips202x2.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/fips202x2.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/fips202x2.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/fips202x2.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/fips202x2.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/fips202x2.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/fips202x2.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/fips202x2.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/macros.inc b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/macros.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/macros.inc
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/macros.inc
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/macros_common.inc b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/macros_common.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/macros_common.inc
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/macros_common.inc
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/ntt.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/ntt.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/ntt.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/ntt.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/ntt.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/ntt.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/ntt.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/ntt.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/packing.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/packing.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/packing.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/packing.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/packing.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/packing.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/packing.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/packing.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/params.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/params.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/params.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/poly.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/poly.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/poly.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/poly.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/poly.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/poly.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/poly.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/poly.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/polyvec.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/polyvec.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/polyvec.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/polyvec.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/polyvec.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/polyvec.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/polyvec.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/polyvec.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/reduce.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/reduce.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/reduce.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/reduce.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/reduce.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/reduce.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/reduce.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/reduce.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/rounding.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/rounding.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/rounding.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/rounding.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/rounding.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/rounding.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/rounding.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/rounding.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/sign.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/sign.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/sign.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/sign.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/sign.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/sign.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/sign.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/sign.h
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/symmetric-shake.c b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/symmetric-shake.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/symmetric-shake.c
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/symmetric-shake.c
diff --git a/src/sig/dilithium/pqclean_dilithium2_aarch64/symmetric.h b/src/sig/dilithium/oldpqclean_dilithium2_aarch64/symmetric.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium2_aarch64/symmetric.h
rename to src/sig/dilithium/oldpqclean_dilithium2_aarch64/symmetric.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/LICENSE b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/LICENSE
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/LICENSE
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/LICENSE
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/NTT_params.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/NTT_params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/NTT_params.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/NTT_params.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_NTT.S b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_NTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_NTT.S
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_NTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_iNTT.S b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_iNTT.S
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_iNTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_poly.S b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_poly.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/__asm_poly.S
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/__asm_poly.S
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/api.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/api.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/api.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/api.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/feat.S b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/feat.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/feat.S
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/feat.S
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/fips202x2.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/fips202x2.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/fips202x2.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/fips202x2.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/fips202x2.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/fips202x2.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/fips202x2.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/fips202x2.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/macros.inc b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/macros.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/macros.inc
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/macros.inc
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/macros_common.inc b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/macros_common.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/macros_common.inc
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/macros_common.inc
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/ntt.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/ntt.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/ntt.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/ntt.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/ntt.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/ntt.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/ntt.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/ntt.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/packing.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/packing.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/packing.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/packing.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/packing.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/packing.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/packing.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/packing.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/params.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/params.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/params.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/poly.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/poly.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/poly.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/poly.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/poly.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/poly.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/poly.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/poly.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/polyvec.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/polyvec.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/polyvec.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/polyvec.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/polyvec.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/polyvec.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/polyvec.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/polyvec.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/reduce.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/reduce.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/reduce.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/reduce.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/reduce.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/reduce.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/reduce.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/reduce.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/rounding.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/rounding.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/rounding.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/rounding.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/rounding.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/rounding.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/rounding.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/rounding.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/sign.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/sign.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/sign.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/sign.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/sign.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/sign.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/sign.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/sign.h
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/symmetric-shake.c b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/symmetric-shake.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/symmetric-shake.c
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/symmetric-shake.c
diff --git a/src/sig/dilithium/pqclean_dilithium3_aarch64/symmetric.h b/src/sig/dilithium/oldpqclean_dilithium3_aarch64/symmetric.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium3_aarch64/symmetric.h
rename to src/sig/dilithium/oldpqclean_dilithium3_aarch64/symmetric.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/LICENSE b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/LICENSE
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/LICENSE
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/LICENSE
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/NTT_params.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/NTT_params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/NTT_params.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/NTT_params.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_NTT.S b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_NTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_NTT.S
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_NTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_iNTT.S b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_iNTT.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_iNTT.S
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_iNTT.S
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_poly.S b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_poly.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/__asm_poly.S
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/__asm_poly.S
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/api.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/api.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/api.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/api.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/feat.S b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/feat.S
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/feat.S
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/feat.S
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/fips202x2.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/fips202x2.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/fips202x2.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/fips202x2.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/fips202x2.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/fips202x2.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/fips202x2.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/fips202x2.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/macros.inc b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/macros.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/macros.inc
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/macros.inc
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/macros_common.inc b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/macros_common.inc
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/macros_common.inc
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/macros_common.inc
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/ntt.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/ntt.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/ntt.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/ntt.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/ntt.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/ntt.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/ntt.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/ntt.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/packing.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/packing.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/packing.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/packing.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/packing.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/packing.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/packing.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/packing.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/params.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/params.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/params.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/params.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/poly.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/poly.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/poly.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/poly.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/poly.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/poly.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/poly.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/poly.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/polyvec.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/polyvec.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/polyvec.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/polyvec.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/polyvec.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/polyvec.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/polyvec.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/polyvec.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/reduce.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/reduce.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/reduce.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/reduce.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/reduce.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/reduce.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/reduce.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/reduce.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/rounding.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/rounding.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/rounding.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/rounding.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/rounding.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/rounding.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/rounding.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/rounding.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/sign.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/sign.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/sign.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/sign.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/sign.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/sign.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/sign.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/sign.h
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/symmetric-shake.c b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/symmetric-shake.c
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/symmetric-shake.c
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/symmetric-shake.c
diff --git a/src/sig/dilithium/pqclean_dilithium5_aarch64/symmetric.h b/src/sig/dilithium/oldpqclean_dilithium5_aarch64/symmetric.h
similarity index 100%
rename from src/sig/dilithium/pqclean_dilithium5_aarch64/symmetric.h
rename to src/sig/dilithium/oldpqclean_dilithium5_aarch64/symmetric.h