diff --git a/GNUmakefile.in b/GNUmakefile.in
index 80ebed7..acd8694 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,19 +1,19 @@
 
 CC= @CC@
 CSTD= @CSTD@
-CFLAGS= $(CSTD) @CFLAGS@ @CPPFLAGS@ -DED25519_@ED25519IMPL@ @MYDEFS@
-ASFLAGS=
-LDFLAGS= @NOPIE@ @LDFLAGS@
+CFLAGS= $(CSTD) @CFLAGS@ @CPPFLAGS@ -DED25519_@ED25519IMPL@ @PIE@ @MYDEFS@
+ASFLAGS= @PIE@
+LDFLAGS= @LDFLAGS@
 MV= mv
 
 ED25519_DEFS= -DED25519_ref10 -DED25519_amd64_51_30k -DED25519_amd64_64_24k -DED25519_donna
 ED25519_ref10= $(patsubst @SRCDIR@/%.c,%.c.o,$(wildcard @SRCDIR@/ed25519/ref10/*.c))
 ED25519_amd64_51_30k= \
 	$(patsubst @SRCDIR@/%.c,%.c.o,$(wildcard @SRCDIR@/ed25519/amd64-51-30k/*.c)) \
-	$(patsubst @SRCDIR@/%.s,%.s.o,$(wildcard @SRCDIR@/ed25519/amd64-51-30k/*.s))
+	$(patsubst @SRCDIR@/%.S,%.S.o,$(wildcard @SRCDIR@/ed25519/amd64-51-30k/*.S))
 ED25519_amd64_64_24k= \
 	$(patsubst @SRCDIR@/%.c,%.c.o,$(wildcard @SRCDIR@/ed25519/amd64-64-24k/*.c)) \
-	$(patsubst @SRCDIR@/%.s,%.s.o,$(wildcard @SRCDIR@/ed25519/amd64-64-24k/*.s))
+	$(patsubst @SRCDIR@/%.S,%.S.o,$(wildcard @SRCDIR@/ed25519/amd64-64-24k/*.S))
 ED25519_donna=
 ED25519_OBJ= $(ED25519_@ED25519IMPL@)
 
@@ -128,10 +128,22 @@ depend:
 
 VPATH=@SRCDIR@
 
+%.c.o: CFLAGS += \
+	-D'CRYPTO_NAMESPACETOP=crypto_sign_ed25519_@ED25519IMPL@'               \
+	-D'_CRYPTO_NAMESPACETOP=_crypto_sign_ed25519_@ED25519IMPL@'             \
+	-D'CRYPTO_NAMESPACE(name)=crypto_sign_ed25519_@ED25519IMPL@_\#\#name'   \
+	-D'_CRYPTO_NAMESPACE(name)=_crypto_sign_ed25519_@ED25519IMPL@_\#\#name' \
+
+%.S.o: ASFLAGS += \
+	-D'CRYPTO_NAMESPACETOP=crypto_sign_ed25519_@ED25519IMPL@'               \
+	-D'_CRYPTO_NAMESPACETOP=_crypto_sign_ed25519_@ED25519IMPL@'             \
+	-D'CRYPTO_NAMESPACE(name)=crypto_sign_ed25519_@ED25519IMPL@_\#\#name'   \
+	-D'_CRYPTO_NAMESPACE(name)=_crypto_sign_ed25519_@ED25519IMPL@_\#\#name' \
+
 %.c.o: %.c
 	$(CC) $(CFLAGS) -c -o $@.tmp $< && $(MV) $@.tmp $@
 
-%.s.o: %.s
+%.S.o: %.S
 	$(CC) $(ASFLAGS) -c -o $@.tmp $< && $(MV) $@.tmp $@
 
 # DO NOT DELETE THIS LINE
@@ -404,13 +416,15 @@ main.c.o: filters_common.inc.h ifilter_bitsum.h
 test_base16.c.o: types.h base16.h
 test_base32.c.o: types.h base32.h
 test_base64.c.o: types.h base64.h
-test_ed25519.c.o: types.h base16.h ed25519/ed25519.h ed25519/ref10/ed25519.h
-test_ed25519.c.o: ed25519/ref10/ge.h ed25519/ref10/fe.h
-test_ed25519.c.o: ed25519/ref10/crypto_int32.h ed25519/amd64-51-30k/ed25519.h
+test_ed25519.c.o: types.h base16.h ed25519/ed25519.h
+test_ed25519.c.o: ed25519/ed25519_impl_pre.h ed25519/ref10/crypto_sign.h
+test_ed25519.c.o: ed25519/amd64-51-30k/ed25519.h ed25519/ref10/ge.h
+test_ed25519.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
+test_ed25519.c.o: ed25519/amd64-51-30k/crypto_sign.h
 test_ed25519.c.o: ed25519/amd64-51-30k/ge25519.h
 test_ed25519.c.o: ed25519/amd64-51-30k/fe25519.h
 test_ed25519.c.o: ed25519/amd64-51-30k/sc25519.h
-test_ed25519.c.o: ed25519/amd64-64-24k/ed25519.h
+test_ed25519.c.o: ed25519/amd64-64-24k/crypto_sign.h
 test_ed25519.c.o: ed25519/amd64-64-24k/ge25519.h
 test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna.h
 test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna-portable.h
@@ -430,13 +444,15 @@ test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna-32bit-sse2.h
 test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna-64bit-sse2.h
 test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna-impl-sse2.h
 test_ed25519.c.o: ed25519/ed25519-donna/ed25519-donna-impl-base.h testutil.h
+test_ed25519.c.o: ed25519/ed25519_impl_post.h
 vec.c.o: vec.h
 worker.c.o: types.h likely.h vec.h base32.h keccak.h ed25519/ed25519.h
-worker.c.o: ed25519/ref10/ed25519.h ed25519/ref10/ge.h ed25519/ref10/fe.h
-worker.c.o: ed25519/ref10/crypto_int32.h ed25519/amd64-51-30k/ed25519.h
-worker.c.o: ed25519/amd64-51-30k/ge25519.h ed25519/amd64-51-30k/fe25519.h
-worker.c.o: ed25519/amd64-51-30k/sc25519.h ed25519/amd64-64-24k/ed25519.h
-worker.c.o: ed25519/amd64-64-24k/ge25519.h
+worker.c.o: ed25519/ed25519_impl_pre.h ed25519/ref10/crypto_sign.h
+worker.c.o: ed25519/amd64-51-30k/ed25519.h ed25519/ref10/ge.h
+worker.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
+worker.c.o: ed25519/amd64-51-30k/crypto_sign.h ed25519/amd64-51-30k/ge25519.h
+worker.c.o: ed25519/amd64-51-30k/fe25519.h ed25519/amd64-51-30k/sc25519.h
+worker.c.o: ed25519/amd64-64-24k/crypto_sign.h ed25519/amd64-64-24k/ge25519.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna-portable.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna-portable-identify.h
@@ -458,4 +474,5 @@ worker.c.o: ed25519/ed25519-donna/ed25519-donna-impl-base.h ioutil.h common.h
 worker.c.o: yaml.h worker.h filters.h filters_inc.inc.h filters_worker.inc.h
 worker.c.o: filters_common.inc.h worker_slow.inc.h worker_fast.inc.h
 worker.c.o: worker_fast_pass.inc.h worker_batch.inc.h worker_batch_pass.inc.h
+worker.c.o: ed25519/ed25519_impl_post.h
 yaml.c.o: types.h yaml.h ioutil.h base32.h base64.h common.h
diff --git a/configure.ac b/configure.ac
index 35a488e..68152c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,31 +27,18 @@ then
 	CFLAGS="$oldcflags"
 fi
 
-nopie=""
+pie=""
 
 oldcflags="$CFLAGS"
-CFLAGS="-nopie -Werror"
-AC_MSG_CHECKING([whether CC supports -nopie])
+CFLAGS="-fPIE -Werror"
+AC_MSG_CHECKING([whether CC supports -fPIE])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
 	[AC_MSG_RESULT([yes])]
-	[nopie="-nopie"],
+	[pie="-fPIE"],
 	[AC_MSG_RESULT([no])]
 )
 CFLAGS="$oldcflags"
 
-if test "x$nopie" = "x"
-then
-	oldcflags="$CFLAGS"
-	CFLAGS="-no-pie -Werror"
-	AC_MSG_CHECKING([whether CC supports -no-pie])
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
-		[AC_MSG_RESULT([yes])]
-		[nopie="-no-pie"],
-		[AC_MSG_RESULT([no])]
-	)
-	CFLAGS="$oldcflags"
-fi
-
 MYDEFS=""
 MAINLIB=""
 
@@ -357,7 +344,7 @@ AC_SUBST(CSTD,["$cstd"])
 AC_SUBST(ED25519IMPL,["$ed25519impl"])
 AC_SUBST(MYDEFS,["$MYDEFS"])
 AC_SUBST(MAINLIB,["$MAINLIB"])
-AC_SUBST(NOPIE,["$nopie"])
+AC_SUBST(PIE,["$pie"])
 AC_SUBST(SRCDIR,["$srcdir"])
 AC_CONFIG_FILES([GNUmakefile])
 AC_OUTPUT
diff --git a/ed25519/amd64-51-30k/choose_t.s b/ed25519/amd64-51-30k/choose_t.S
similarity index 96%
rename from ed25519/amd64-51-30k/choose_t.s
rename to ed25519/amd64-51-30k/choose_t.S
index 6a64c08..ef6eb43 100644
--- a/ed25519/amd64-51-30k/choose_t.s
+++ b/ed25519/amd64-51-30k/choose_t.S
@@ -105,13 +105,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_choose_t
+# qhasm: enter CRYPTO_NAMESPACE(batch_choose_t)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_choose_t
-.globl crypto_sign_ed25519_amd64_51_30k_batch_choose_t
-_crypto_sign_ed25519_amd64_51_30k_batch_choose_t:
-crypto_sign_ed25519_amd64_51_30k_batch_choose_t:
+.globl _CRYPTO_NAMESPACE(batch_choose_t)
+.globl CRYPTO_NAMESPACE(batch_choose_t)
+_CRYPTO_NAMESPACE(batch_choose_t):
+CRYPTO_NAMESPACE(batch_choose_t):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -1677,30 +1677,30 @@ movq   952(%rcx,%rdi),%rdi
 # asm 2: cmove <t=%rdi,<tt2d4=%r11
 cmove %rdi,%r11
 
-# qhasm: tt0 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,>tt0=int64#1
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,>tt0=%rdi
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdi
+# qhasm: tt0 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P0),>tt0=int64#1
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P0),>tt0=%rdi
+movq CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdi
 
-# qhasm: tt1 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt1=int64#4
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt1=%rcx
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: tt1 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>tt1=int64#4
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>tt1=%rcx
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: tt2 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt2=int64#5
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt2=%r8
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: tt2 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>tt2=int64#5
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>tt2=%r8
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: tt3 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt3=int64#10
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt3=%r12
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: tt3 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>tt3=int64#10
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>tt3=%r12
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
-# qhasm: tt4 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt4=int64#11
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>tt4=%r13
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r13
+# qhasm: tt4 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>tt4=int64#11
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>tt4=%r13
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r13
 
 # qhasm: tt0 -= tt2d0
 # asm 1: sub  <tt2d0=int64#2,<tt0=int64#1
diff --git a/ed25519/amd64-51-30k/consts.S b/ed25519/amd64-51-30k/consts.S
new file mode 100644
index 0000000..b2ca1ab
--- /dev/null
+++ b/ed25519/amd64-51-30k/consts.S
@@ -0,0 +1,47 @@
+.section .rodata
+
+.globl CRYPTO_NAMESPACE(batch_REDMASK51)
+.globl CRYPTO_NAMESPACE(batch_121666_213)
+.globl CRYPTO_NAMESPACE(batch_2P0)
+.globl CRYPTO_NAMESPACE(batch_2P1234)
+.globl CRYPTO_NAMESPACE(batch_4P0)
+.globl CRYPTO_NAMESPACE(batch_4P1234)
+.globl CRYPTO_NAMESPACE(batch_MU0)
+.globl CRYPTO_NAMESPACE(batch_MU1)
+.globl CRYPTO_NAMESPACE(batch_MU2)
+.globl CRYPTO_NAMESPACE(batch_MU3)
+.globl CRYPTO_NAMESPACE(batch_MU4)
+.globl CRYPTO_NAMESPACE(batch_ORDER0)
+.globl CRYPTO_NAMESPACE(batch_ORDER1)
+.globl CRYPTO_NAMESPACE(batch_ORDER2)
+.globl CRYPTO_NAMESPACE(batch_ORDER3)
+.globl CRYPTO_NAMESPACE(batch_EC2D0)
+.globl CRYPTO_NAMESPACE(batch_EC2D1)
+.globl CRYPTO_NAMESPACE(batch_EC2D2)
+.globl CRYPTO_NAMESPACE(batch_EC2D3)
+.globl CRYPTO_NAMESPACE(batch_EC2D4)
+.globl CRYPTO_NAMESPACE(batch__38)
+
+.p2align 4
+
+CRYPTO_NAMESPACE(batch_REDMASK51):   .quad 0x0007FFFFFFFFFFFF
+CRYPTO_NAMESPACE(batch_121666_213): .quad 996687872
+CRYPTO_NAMESPACE(batch_2P0):        .quad 0xFFFFFFFFFFFDA
+CRYPTO_NAMESPACE(batch_2P1234):     .quad 0xFFFFFFFFFFFFE
+CRYPTO_NAMESPACE(batch_4P0):        .quad 0x1FFFFFFFFFFFB4
+CRYPTO_NAMESPACE(batch_4P1234):     .quad 0x1FFFFFFFFFFFFC
+CRYPTO_NAMESPACE(batch_MU0):         .quad 0xED9CE5A30A2C131B
+CRYPTO_NAMESPACE(batch_MU1):         .quad 0x2106215D086329A7
+CRYPTO_NAMESPACE(batch_MU2):         .quad 0xFFFFFFFFFFFFFFEB
+CRYPTO_NAMESPACE(batch_MU3):         .quad 0xFFFFFFFFFFFFFFFF
+CRYPTO_NAMESPACE(batch_MU4):         .quad 0x000000000000000F
+CRYPTO_NAMESPACE(batch_ORDER0):      .quad 0x5812631A5CF5D3ED
+CRYPTO_NAMESPACE(batch_ORDER1):      .quad 0x14DEF9DEA2F79CD6
+CRYPTO_NAMESPACE(batch_ORDER2):      .quad 0x0000000000000000
+CRYPTO_NAMESPACE(batch_ORDER3):      .quad 0x1000000000000000
+CRYPTO_NAMESPACE(batch_EC2D0):       .quad 1859910466990425
+CRYPTO_NAMESPACE(batch_EC2D1):       .quad 932731440258426
+CRYPTO_NAMESPACE(batch_EC2D2):       .quad 1072319116312658
+CRYPTO_NAMESPACE(batch_EC2D3):       .quad 1815898335770999
+CRYPTO_NAMESPACE(batch_EC2D4):       .quad 633789495995903
+CRYPTO_NAMESPACE(batch__38):         .quad 38
diff --git a/ed25519/amd64-51-30k/consts.s b/ed25519/amd64-51-30k/consts.s
deleted file mode 100644
index 838982b..0000000
--- a/ed25519/amd64-51-30k/consts.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.data
-
-.globl crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-.globl crypto_sign_ed25519_amd64_51_30k_batch_121666_213
-.globl crypto_sign_ed25519_amd64_51_30k_batch_2P0
-.globl crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-.globl crypto_sign_ed25519_amd64_51_30k_batch_4P0
-.globl crypto_sign_ed25519_amd64_51_30k_batch_4P1234
-.globl crypto_sign_ed25519_amd64_51_30k_batch_MU0
-.globl crypto_sign_ed25519_amd64_51_30k_batch_MU1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_MU2
-.globl crypto_sign_ed25519_amd64_51_30k_batch_MU3
-.globl crypto_sign_ed25519_amd64_51_30k_batch_MU4
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ORDER2
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ORDER3
-.globl crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-.globl crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-.globl crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-.globl crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-.globl crypto_sign_ed25519_amd64_51_30k_batch__38
-
-.p2align 4
-
-crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51:   .quad 0x0007FFFFFFFFFFFF
-crypto_sign_ed25519_amd64_51_30k_batch_121666_213: .quad 996687872
-crypto_sign_ed25519_amd64_51_30k_batch_2P0:        .quad 0xFFFFFFFFFFFDA
-crypto_sign_ed25519_amd64_51_30k_batch_2P1234:     .quad 0xFFFFFFFFFFFFE
-crypto_sign_ed25519_amd64_51_30k_batch_4P0:        .quad 0x1FFFFFFFFFFFB4
-crypto_sign_ed25519_amd64_51_30k_batch_4P1234:     .quad 0x1FFFFFFFFFFFFC
-crypto_sign_ed25519_amd64_51_30k_batch_MU0:         .quad 0xED9CE5A30A2C131B
-crypto_sign_ed25519_amd64_51_30k_batch_MU1:         .quad 0x2106215D086329A7
-crypto_sign_ed25519_amd64_51_30k_batch_MU2:         .quad 0xFFFFFFFFFFFFFFEB
-crypto_sign_ed25519_amd64_51_30k_batch_MU3:         .quad 0xFFFFFFFFFFFFFFFF
-crypto_sign_ed25519_amd64_51_30k_batch_MU4:         .quad 0x000000000000000F
-crypto_sign_ed25519_amd64_51_30k_batch_ORDER0:      .quad 0x5812631A5CF5D3ED
-crypto_sign_ed25519_amd64_51_30k_batch_ORDER1:      .quad 0x14DEF9DEA2F79CD6
-crypto_sign_ed25519_amd64_51_30k_batch_ORDER2:      .quad 0x0000000000000000
-crypto_sign_ed25519_amd64_51_30k_batch_ORDER3:      .quad 0x1000000000000000
-crypto_sign_ed25519_amd64_51_30k_batch_EC2D0:       .quad 1859910466990425
-crypto_sign_ed25519_amd64_51_30k_batch_EC2D1:       .quad 932731440258426
-crypto_sign_ed25519_amd64_51_30k_batch_EC2D2:       .quad 1072319116312658
-crypto_sign_ed25519_amd64_51_30k_batch_EC2D3:       .quad 1815898335770999
-crypto_sign_ed25519_amd64_51_30k_batch_EC2D4:       .quad 633789495995903
-crypto_sign_ed25519_amd64_51_30k_batch__38:         .quad 38
diff --git a/ed25519/amd64-51-30k/crypto_sign.h b/ed25519/amd64-51-30k/crypto_sign.h
index 716e048..35b0a74 100644
--- a/ed25519/amd64-51-30k/crypto_sign.h
+++ b/ed25519/amd64-51-30k/crypto_sign.h
@@ -1,9 +1,9 @@
-#define crypto_sign ed25519_amd64_51_30k_sign
-#define crypto_sign_keypair ed25519_amd64_51_30k_keygen
-#define crypto_sign_seckey ed25519_amd64_51_30k_seckey
-#define crypto_sign_seckey_expand ed25519_amd64_51_30k_seckey_expand
-#define crypto_sign_pubkey ed25519_amd64_51_30k_pubkey
-#define crypto_sign_open ed25519_amd64_51_30k_open
-#define crypto_sign_open_batch ed25519_amd64_51_30k_open_batch
+#define crypto_sign               CRYPTO_NAMESPACE(sign)
+#define crypto_sign_keypair       CRYPTO_NAMESPACE(keygen)
+#define crypto_sign_seckey        CRYPTO_NAMESPACE(seckey)
+#define crypto_sign_seckey_expand CRYPTO_NAMESPACE(seckey_expand)
+#define crypto_sign_pubkey        CRYPTO_NAMESPACE(pubkey)
+#define crypto_sign_open          CRYPTO_NAMESPACE(open)
+#define crypto_sign_open_batch    CRYPTO_NAMESPACE(open_batch)
 
 #include "ed25519.h"
diff --git a/ed25519/amd64-51-30k/ed25519.h b/ed25519/amd64-51-30k/ed25519.h
index 973bca6..50c610d 100644
--- a/ed25519/amd64-51-30k/ed25519.h
+++ b/ed25519/amd64-51-30k/ed25519.h
@@ -1,20 +1,20 @@
-int ed25519_amd64_51_30k_seckey(unsigned char *sk);
-int ed25519_amd64_51_30k_seckey_expand(unsigned char *sk,const unsigned char *seed);
-int ed25519_amd64_51_30k_pubkey(unsigned char *pk,const unsigned char *sk);
-int ed25519_amd64_51_30k_keygen(unsigned char *pk,unsigned char *sk);
-int ed25519_amd64_51_30k_sign(
+int crypto_sign_seckey(unsigned char *sk);
+int crypto_sign_seckey_expand(unsigned char *sk,const unsigned char *seed);
+int crypto_sign_pubkey(unsigned char *pk,const unsigned char *sk);
+int crypto_sign_keypair(unsigned char *pk,unsigned char *sk);
+int crypto_sign(
     unsigned char *sm,unsigned long long *smlen,
     const unsigned char *m,unsigned long long mlen,
     const unsigned char *sk
 );
-int ed25519_amd64_51_30k_open(
+int crypto_sign_open(
     unsigned char *m,unsigned long long *mlen,
     const unsigned char *sm,unsigned long long smlen,
     const unsigned char *pk
 );
-int ed25519_amd64_51_30k_batch(
+int crypto_sign_open_batch(
     unsigned char* const m[],unsigned long long mlen[],
     unsigned char* const sm[],const unsigned long long smlen[],
-    unsigned char* const pk[], 
+    unsigned char* const pk[],
     unsigned long long num
 );
diff --git a/ed25519/amd64-51-30k/fe25519.h b/ed25519/amd64-51-30k/fe25519.h
index c4c9ed3..32dd823 100644
--- a/ed25519/amd64-51-30k/fe25519.h
+++ b/ed25519/amd64-51-30k/fe25519.h
@@ -3,24 +3,25 @@
 
 #include <stddef.h>
 
-#define fe25519              crypto_sign_ed25519_amd64_51_30k_batch_fe25519
-#define fe25519_freeze       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze
-#define fe25519_unpack       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_unpack
-#define fe25519_pack         crypto_sign_ed25519_amd64_51_30k_batch_fe25519_pack
-#define fe25519_iszero_vartime       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_iszero_vartime
-#define fe25519_iseq_vartime crypto_sign_ed25519_amd64_51_30k_batch_fe25519_iseq_vartime
-#define fe25519_cmov         crypto_sign_ed25519_amd64_51_30k_batch_fe25519_cmov
-#define fe25519_setint       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_setint
-#define fe25519_neg          crypto_sign_ed25519_amd64_51_30k_batch_fe25519_neg
-#define fe25519_getparity    crypto_sign_ed25519_amd64_51_30k_batch_fe25519_getparity
-#define fe25519_add          crypto_sign_ed25519_amd64_51_30k_batch_fe25519_add
-#define fe25519_sub          crypto_sign_ed25519_amd64_51_30k_batch_fe25519_sub
-#define fe25519_mul          crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul
-#define fe25519_mul121666    crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul121666
-#define fe25519_square       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square
-#define fe25519_nsquare       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare
-#define fe25519_invert       crypto_sign_ed25519_amd64_51_30k_batch_fe25519_invert
-#define fe25519_pow2523      crypto_sign_ed25519_amd64_51_30k_batch_fe25519_pow2523
+#define fe25519              CRYPTO_NAMESPACE(batch_fe25519)
+#define fe25519_freeze       CRYPTO_NAMESPACE(batch_fe25519_freeze)
+#define fe25519_unpack       CRYPTO_NAMESPACE(batch_fe25519_unpack)
+#define fe25519_pack         CRYPTO_NAMESPACE(batch_fe25519_pack)
+#define fe25519_iszero_vartime       CRYPTO_NAMESPACE(batch_fe25519_iszero_vartime)
+#define fe25519_iseq_vartime CRYPTO_NAMESPACE(batch_fe25519_iseq_vartime)
+#define fe25519_cmov         CRYPTO_NAMESPACE(batch_fe25519_cmov)
+#define fe25519_setint       CRYPTO_NAMESPACE(batch_fe25519_setint)
+#define fe25519_neg          CRYPTO_NAMESPACE(batch_fe25519_neg)
+#define fe25519_getparity    CRYPTO_NAMESPACE(batch_fe25519_getparity)
+#define fe25519_add          CRYPTO_NAMESPACE(batch_fe25519_add)
+#define fe25519_sub          CRYPTO_NAMESPACE(batch_fe25519_sub)
+#define fe25519_mul          CRYPTO_NAMESPACE(batch_fe25519_mul)
+#define fe25519_mul121666    CRYPTO_NAMESPACE(batch_fe25519_mul121666)
+#define fe25519_square       CRYPTO_NAMESPACE(batch_fe25519_square)
+#define fe25519_nsquare       CRYPTO_NAMESPACE(batch_fe25519_nsquare)
+#define fe25519_invert       CRYPTO_NAMESPACE(batch_fe25519_invert)
+#define fe25519_batchinvert  CRYPTO_NAMESPACE(batch_fe25519_batchinvert)
+#define fe25519_pow2523      CRYPTO_NAMESPACE(batch_fe25519_pow2523)
 
 typedef struct
 {
diff --git a/ed25519/amd64-51-30k/fe25519_freeze.s b/ed25519/amd64-51-30k/fe25519_freeze.S
similarity index 94%
rename from ed25519/amd64-51-30k/fe25519_freeze.s
rename to ed25519/amd64-51-30k/fe25519_freeze.S
index 5cd0b1d..0435525 100644
--- a/ed25519/amd64-51-30k/fe25519_freeze.s
+++ b/ed25519/amd64-51-30k/fe25519_freeze.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze
+# qhasm: enter CRYPTO_NAMESPACE(batch_fe25519_freeze)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze
-.globl crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze
-_crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze:
-crypto_sign_ed25519_amd64_51_30k_batch_fe25519_freeze:
+.globl _CRYPTO_NAMESPACE(batch_fe25519_freeze)
+.globl CRYPTO_NAMESPACE(batch_fe25519_freeze)
+_CRYPTO_NAMESPACE(batch_fe25519_freeze):
+CRYPTO_NAMESPACE(batch_fe25519_freeze):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -135,10 +135,10 @@ movq   24(%rdi),%r8
 # asm 2: movq   32(<rp=%rdi),>r4=%r9
 movq   32(%rdi),%r9
 
-# qhasm: two51minus1 = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>two51minus1=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>two51minus1=%rax
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rax
+# qhasm: two51minus1 = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>two51minus1=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>two51minus1=%rax
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rax
 
 # qhasm: two51minus19 = two51minus1
 # asm 1: mov  <two51minus1=int64#7,>two51minus19=int64#8
diff --git a/ed25519/amd64-51-30k/fe25519_mul.s b/ed25519/amd64-51-30k/fe25519_mul.S
similarity index 97%
rename from ed25519/amd64-51-30k/fe25519_mul.s
rename to ed25519/amd64-51-30k/fe25519_mul.S
index 9d6c537..cbcdbe9 100644
--- a/ed25519/amd64-51-30k/fe25519_mul.s
+++ b/ed25519/amd64-51-30k/fe25519_mul.S
@@ -97,13 +97,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul
+# qhasm: enter CRYPTO_NAMESPACE(batch_fe25519_mul)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul
-.globl crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul
-_crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul:
-crypto_sign_ed25519_amd64_51_30k_batch_fe25519_mul:
+.globl _CRYPTO_NAMESPACE(batch_fe25519_mul)
+.globl CRYPTO_NAMESPACE(batch_fe25519_mul)
+_CRYPTO_NAMESPACE(batch_fe25519_mul):
+CRYPTO_NAMESPACE(batch_fe25519_mul):
 mov %rsp,%r11
 and $31,%r11
 add $96,%r11
@@ -689,10 +689,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.r0) << 13
 # asm 1: shld $13,<r0=int64#5,<mulr01=int64#6
diff --git a/ed25519/amd64-51-30k/fe25519_nsquare.s b/ed25519/amd64-51-30k/fe25519_nsquare.S
similarity index 96%
rename from ed25519/amd64-51-30k/fe25519_nsquare.s
rename to ed25519/amd64-51-30k/fe25519_nsquare.S
index cd749bc..da881e3 100644
--- a/ed25519/amd64-51-30k/fe25519_nsquare.s
+++ b/ed25519/amd64-51-30k/fe25519_nsquare.S
@@ -87,13 +87,13 @@
 
 # qhasm: stack64 n_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare
+# qhasm: enter CRYPTO_NAMESPACE(batch_fe25519_nsquare)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare
-.globl crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare
-_crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare:
-crypto_sign_ed25519_amd64_51_30k_batch_fe25519_nsquare:
+.globl _CRYPTO_NAMESPACE(batch_fe25519_nsquare)
+.globl CRYPTO_NAMESPACE(batch_fe25519_nsquare)
+_CRYPTO_NAMESPACE(batch_fe25519_nsquare):
+CRYPTO_NAMESPACE(batch_fe25519_nsquare):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -497,10 +497,10 @@ add  %rax,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r14
 adc %rdx,%r14
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   squarer01 = (squarer01.r0) << 13
 # asm 1: shld $13,<r0=int64#4,<squarer01=int64#5
diff --git a/ed25519/amd64-51-30k/fe25519_square.s b/ed25519/amd64-51-30k/fe25519_square.S
similarity index 96%
rename from ed25519/amd64-51-30k/fe25519_square.s
rename to ed25519/amd64-51-30k/fe25519_square.S
index 971c197..1da44df 100644
--- a/ed25519/amd64-51-30k/fe25519_square.s
+++ b/ed25519/amd64-51-30k/fe25519_square.S
@@ -85,13 +85,13 @@
 
 # qhasm: int64 squareredmask
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square
+# qhasm: enter CRYPTO_NAMESPACE(batch_fe25519_square)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square
-.globl crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square
-_crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square:
-crypto_sign_ed25519_amd64_51_30k_batch_fe25519_square:
+.globl _CRYPTO_NAMESPACE(batch_fe25519_square)
+.globl CRYPTO_NAMESPACE(batch_fe25519_square)
+_CRYPTO_NAMESPACE(batch_fe25519_square):
+CRYPTO_NAMESPACE(batch_fe25519_square):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -492,10 +492,10 @@ add  %rax,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r14
 adc %rdx,%r14
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   squarer01 = (squarer01.r0) << 13
 # asm 1: shld $13,<r0=int64#4,<squarer01=int64#5
diff --git a/ed25519/amd64-51-30k/ge25519.h b/ed25519/amd64-51-30k/ge25519.h
index d53bacd..f18c338 100644
--- a/ed25519/amd64-51-30k/ge25519.h
+++ b/ed25519/amd64-51-30k/ge25519.h
@@ -12,26 +12,26 @@
 #include "fe25519.h"
 #include "sc25519.h"
 
-#define ge25519                           crypto_sign_ed25519_amd64_51_30k_batch_ge25519
-#define ge25519_base                      crypto_sign_ed25519_amd64_51_30k_batch_ge25519_base
-#define ge25519_unpackneg_vartime         crypto_sign_ed25519_amd64_51_30k_batch_unpackneg_vartime
-#define ge25519_pack                      crypto_sign_ed25519_amd64_51_30k_batch_pack
-#define ge25519_isneutral_vartime         crypto_sign_ed25519_amd64_51_30k_batch_isneutral_vartime
-#define ge25519_add                       crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add
-#define ge25519_double                    crypto_sign_ed25519_amd64_51_30k_batch_ge25519_double
-#define ge25519_double_scalarmult_vartime crypto_sign_ed25519_amd64_51_30k_batch_double_scalarmult_vartime
-#define ge25519_multi_scalarmult_vartime  crypto_sign_ed25519_amd64_51_30k_batch_ge25519_multi_scalarmult_vartime
-#define ge25519_scalarmult_base           crypto_sign_ed25519_amd64_51_30k_batch_scalarmult_base
-#define ge25519_p1p1_to_p2                crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2
-#define ge25519_p1p1_to_p3                crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3
-#define ge25519_p1p1_to_pniels            crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels
-#define ge25519_add_p1p1                  crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1
-#define ge25519_dbl_p1p1                  crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1
-#define choose_t                          crypto_sign_ed25519_amd64_51_30k_batch_choose_t
-#define choose_t_smultq                   crypto_sign_ed25519_amd64_51_30k_batch_choose_t_smultq
-#define ge25519_nielsadd2                 crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2
-#define ge25519_nielsadd_p1p1             crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1
-#define ge25519_pnielsadd_p1p1            crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1
+#define ge25519                           CRYPTO_NAMESPACE(batch_ge25519)
+#define ge25519_base                      CRYPTO_NAMESPACE(batch_ge25519_base)
+#define ge25519_unpackneg_vartime         CRYPTO_NAMESPACE(batch_unpackneg_vartime)
+#define ge25519_pack                      CRYPTO_NAMESPACE(batch_pack)
+#define ge25519_isneutral_vartime         CRYPTO_NAMESPACE(batch_isneutral_vartime)
+#define ge25519_add                       CRYPTO_NAMESPACE(batch_ge25519_add)
+#define ge25519_double                    CRYPTO_NAMESPACE(batch_ge25519_double)
+#define ge25519_double_scalarmult_vartime CRYPTO_NAMESPACE(batch_double_scalarmult_vartime)
+#define ge25519_multi_scalarmult_vartime  CRYPTO_NAMESPACE(batch_ge25519_multi_scalarmult_vartime)
+#define ge25519_scalarmult_base           CRYPTO_NAMESPACE(batch_scalarmult_base)
+#define ge25519_p1p1_to_p2                CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2)
+#define ge25519_p1p1_to_p3                CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3)
+#define ge25519_p1p1_to_pniels            CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels)
+#define ge25519_add_p1p1                  CRYPTO_NAMESPACE(batch_ge25519_add_p1p1)
+#define ge25519_dbl_p1p1                  CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1)
+#define choose_t                          CRYPTO_NAMESPACE(batch_choose_t)
+#define choose_t_smultq                   CRYPTO_NAMESPACE(batch_choose_t_smultq)
+#define ge25519_nielsadd2                 CRYPTO_NAMESPACE(batch_ge25519_nielsadd2)
+#define ge25519_nielsadd_p1p1             CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1)
+#define ge25519_pnielsadd_p1p1            CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1)
 
 #define ge25519_p3 ge25519
 
diff --git a/ed25519/amd64-51-30k/ge25519_add_p1p1.s b/ed25519/amd64-51-30k/ge25519_add_p1p1.S
similarity index 91%
rename from ed25519/amd64-51-30k/ge25519_add_p1p1.s
rename to ed25519/amd64-51-30k/ge25519_add_p1p1.S
index 5a2a834..f902db1 100644
--- a/ed25519/amd64-51-30k/ge25519_add_p1p1.s
+++ b/ed25519/amd64-51-30k/ge25519_add_p1p1.S
@@ -247,13 +247,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_add_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_add_p1p1:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_add_p1p1)
+.globl CRYPTO_NAMESPACE(batch_ge25519_add_p1p1)
+_CRYPTO_NAMESPACE(batch_ge25519_add_p1p1):
+CRYPTO_NAMESPACE(batch_ge25519_add_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $256,%r11
@@ -329,10 +329,10 @@ movq   72(%rsi),%r10
 # asm 2: mov  <a0=%rdx,>b0=%r11
 mov  %rdx,%r11
 
-# qhasm: a0 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: a0 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<a0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<a0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
 # qhasm: x0 = *(uint64 *)(pp + 0)
 # asm 1: movq   0(<pp=int64#2),>x0=int64#10
@@ -354,10 +354,10 @@ sub  %r12,%rdx
 # asm 2: mov  <a1=%r8,>b1=%r12
 mov  %r8,%r12
 
-# qhasm: a1 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: a1 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
 # qhasm: x1 = *(uint64 *)(pp + 8)
 # asm 1: movq   8(<pp=int64#2),>x1=int64#11
@@ -379,10 +379,10 @@ sub  %r13,%r8
 # asm 2: mov  <a2=%r9,>b2=%r13
 mov  %r9,%r13
 
-# qhasm: a2 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: a2 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
 # qhasm: x2 = *(uint64 *)(pp + 16)
 # asm 1: movq   16(<pp=int64#2),>x2=int64#12
@@ -404,10 +404,10 @@ sub  %r14,%r9
 # asm 2: mov  <a3=%rax,>b3=%r14
 mov  %rax,%r14
 
-# qhasm: a3 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: a3 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
 # qhasm: x3 = *(uint64 *)(pp + 24)
 # asm 1: movq   24(<pp=int64#2),>x3=int64#13
@@ -429,10 +429,10 @@ sub  %r15,%rax
 # asm 2: mov  <a4=%r10,>b4=%r15
 mov  %r10,%r15
 
-# qhasm: a4 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: a4 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: x4 = *(uint64 *)(pp + 32)
 # asm 1: movq   32(<pp=int64#2),>x4=int64#14
@@ -529,10 +529,10 @@ movq   72(%rcx),%r10
 # asm 2: mov  <t10=%rdx,>t20=%r11
 mov  %rdx,%r11
 
-# qhasm: t10 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<t10=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<t10=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: t10 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<t10=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<t10=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
 # qhasm: rx0 = *(uint64 *) (qp + 0)
 # asm 1: movq   0(<qp=int64#4),>rx0=int64#10
@@ -554,10 +554,10 @@ sub  %r12,%rdx
 # asm 2: mov  <t11=%r8,>t21=%r12
 mov  %r8,%r12
 
-# qhasm: t11 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t11=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t11=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: t11 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<t11=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<t11=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
 # qhasm: rx1 = *(uint64 *) (qp + 8)
 # asm 1: movq   8(<qp=int64#4),>rx1=int64#11
@@ -579,10 +579,10 @@ sub  %r13,%r8
 # asm 2: mov  <t12=%r9,>t22=%r13
 mov  %r9,%r13
 
-# qhasm: t12 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t12=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t12=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: t12 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<t12=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<t12=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
 # qhasm: rx2 = *(uint64 *) (qp + 16)
 # asm 1: movq   16(<qp=int64#4),>rx2=int64#12
@@ -604,10 +604,10 @@ sub  %r14,%r9
 # asm 2: mov  <t13=%rax,>t23=%r14
 mov  %rax,%r14
 
-# qhasm: t13 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t13=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t13=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: t13 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<t13=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<t13=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
 # qhasm: rx3 = *(uint64 *) (qp + 24)
 # asm 1: movq   24(<qp=int64#4),>rx3=int64#13
@@ -629,10 +629,10 @@ sub  %r15,%rax
 # asm 2: mov  <t14=%r10,>t24=%r15
 mov  %r10,%r15
 
-# qhasm: t14 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t14=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<t14=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: t14 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<t14=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<t14=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: rx4 = *(uint64 *) (qp + 32)
 # asm 1: movq   32(<qp=int64#4),>rx4=int64#14
@@ -1234,10 +1234,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.a0) << 13
 # asm 1: shld $13,<a0=int64#5,<mulr01=int64#6
@@ -1984,10 +1984,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#5,<mulr01=int64#6
@@ -2199,30 +2199,30 @@ mov  %r11,%r14
 # asm 2: mov  <rx4=%r12,>ry4=%r15
 mov  %r12,%r15
 
-# qhasm: rx0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rx0=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rx0=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%r8
+# qhasm: rx0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<rx0=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<rx0=%r8
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%r8
 
-# qhasm: rx1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx1=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx1=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: rx1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx1=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx1=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: rx2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx2=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx2=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: rx2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx2=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx2=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
-# qhasm: rx3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx3=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx3=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r11
+# qhasm: rx3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx3=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx3=%r11
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r11
 
-# qhasm: rx4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx4=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx4=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: rx4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx4=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx4=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
 # qhasm: ry0 += a0_stack
 # asm 1: addq <a0_stack=stack64#8,<ry0=int64#3
@@ -2859,10 +2859,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.c0) << 13
 # asm 1: shld $13,<c0=int64#5,<mulr01=int64#6
@@ -3089,8 +3089,8 @@ imulq  $19,%rdx,%rax
 # asm 2: movq <mulrax=%rax,>mulx319_stack=96(%rsp)
 movq %rax,96(%rsp)
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   c0 = mulrax
 # asm 1: mov  <mulrax=int64#7,>c0=int64#5
@@ -3117,8 +3117,8 @@ imulq  $19,%rdx,%rax
 # asm 2: movq <mulrax=%rax,>mulx419_stack=104(%rsp)
 movq %rax,104(%rsp)
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? c0 += mulrax
 # asm 1: add  <mulrax=int64#7,<c0=int64#5
@@ -3135,8 +3135,8 @@ adc %rdx,%r9
 # asm 2: movq <c0_stack=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? c0 += mulrax
 # asm 1: add  <mulrax=int64#7,<c0=int64#5
@@ -3153,8 +3153,8 @@ adc %rdx,%r9
 # asm 2: movq <c0_stack=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   c1 = mulrax
 # asm 1: mov  <mulrax=int64#7,>c1=int64#8
@@ -3171,8 +3171,8 @@ mov  %rdx,%r11
 # asm 2: movq <c0_stack=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   c2 = mulrax
 # asm 1: mov  <mulrax=int64#7,>c2=int64#10
@@ -3189,8 +3189,8 @@ mov  %rdx,%r13
 # asm 2: movq <c0_stack=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   c3 = mulrax
 # asm 1: mov  <mulrax=int64#7,>c3=int64#12
@@ -3207,8 +3207,8 @@ mov  %rdx,%r15
 # asm 2: movq <c0_stack=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   c4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>c4=int64#14
@@ -3225,8 +3225,8 @@ mov  %rdx,%rbp
 # asm 2: movq <c1_stack=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? c1 += mulrax
 # asm 1: add  <mulrax=int64#7,<c1=int64#8
@@ -3243,8 +3243,8 @@ adc %rdx,%r11
 # asm 2: movq <c1_stack=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? c2 += mulrax
 # asm 1: add  <mulrax=int64#7,<c2=int64#10
@@ -3261,8 +3261,8 @@ adc %rdx,%r13
 # asm 2: movq <c1_stack=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? c3 += mulrax
 # asm 1: add  <mulrax=int64#7,<c3=int64#12
@@ -3279,8 +3279,8 @@ adc %rdx,%r15
 # asm 2: movq <c1_stack=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? c4 += mulrax
 # asm 1: add  <mulrax=int64#7,<c4=int64#14
@@ -3302,8 +3302,8 @@ movq 64(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? c0 += mulrax
 # asm 1: add  <mulrax=int64#7,<c0=int64#5
@@ -3320,8 +3320,8 @@ adc %rdx,%r9
 # asm 2: movq <c2_stack=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? c2 += mulrax
 # asm 1: add  <mulrax=int64#7,<c2=int64#10
@@ -3338,8 +3338,8 @@ adc %rdx,%r13
 # asm 2: movq <c2_stack=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? c3 += mulrax
 # asm 1: add  <mulrax=int64#7,<c3=int64#12
@@ -3356,8 +3356,8 @@ adc %rdx,%r15
 # asm 2: movq <c2_stack=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? c4 += mulrax
 # asm 1: add  <mulrax=int64#7,<c4=int64#14
@@ -3379,8 +3379,8 @@ movq 72(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? c0 += mulrax
 # asm 1: add  <mulrax=int64#7,<c0=int64#5
@@ -3402,8 +3402,8 @@ movq 72(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? c1 += mulrax
 # asm 1: add  <mulrax=int64#7,<c1=int64#8
@@ -3420,8 +3420,8 @@ adc %rdx,%r11
 # asm 2: movq <c3_stack=80(%rsp),>mulrax=%rax
 movq 80(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? c3 += mulrax
 # asm 1: add  <mulrax=int64#7,<c3=int64#12
@@ -3438,8 +3438,8 @@ adc %rdx,%r15
 # asm 2: movq <c3_stack=80(%rsp),>mulrax=%rax
 movq 80(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? c4 += mulrax
 # asm 1: add  <mulrax=int64#7,<c4=int64#14
@@ -3456,8 +3456,8 @@ adc %rdx,%rbp
 # asm 2: movq <mulx319_stack=96(%rsp),>mulrax=%rax
 movq 96(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? c1 += mulrax
 # asm 1: add  <mulrax=int64#7,<c1=int64#8
@@ -3474,8 +3474,8 @@ adc %rdx,%r11
 # asm 2: movq <mulx319_stack=96(%rsp),>mulrax=%rax
 movq 96(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? c2 += mulrax
 # asm 1: add  <mulrax=int64#7,<c2=int64#10
@@ -3492,8 +3492,8 @@ adc %rdx,%r13
 # asm 2: movq <c4_stack=88(%rsp),>mulrax=%rax
 movq 88(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? c4 += mulrax
 # asm 1: add  <mulrax=int64#7,<c4=int64#14
@@ -3510,8 +3510,8 @@ adc %rdx,%rbp
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? c1 += mulrax
 # asm 1: add  <mulrax=int64#7,<c1=int64#8
@@ -3528,8 +3528,8 @@ adc %rdx,%r11
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? c2 += mulrax
 # asm 1: add  <mulrax=int64#7,<c2=int64#10
@@ -3546,8 +3546,8 @@ adc %rdx,%r13
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? c3 += mulrax
 # asm 1: add  <mulrax=int64#7,<c3=int64#12
@@ -3559,10 +3559,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.c0) << 13
 # asm 1: shld $13,<c0=int64#5,<mulr01=int64#6
@@ -4309,10 +4309,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.rt0) << 13
 # asm 1: shld $13,<rt0=int64#5,<mulr01=int64#6
@@ -4549,30 +4549,30 @@ mov  %rax,%r12
 # asm 2: mov  <rt4=%r10,>rz4=%r13
 mov  %r10,%r13
 
-# qhasm: rt0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rt0=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rt0=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%r8
+# qhasm: rt0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<rt0=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<rt0=%r8
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%r8
 
-# qhasm: rt1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt1=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt1=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: rt1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt1=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt1=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: rt2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt2=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt2=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: rt2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt2=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt2=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: rt3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt3=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt3=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: rt3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt3=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt3=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: rt4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt4=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt4=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: rt4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt4=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt4=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: rz0 += c0_stack
 # asm 1: addq <c0_stack=stack64#8,<rz0=int64#2
diff --git a/ed25519/amd64-51-30k/ge25519_dbl_p1p1.s b/ed25519/amd64-51-30k/ge25519_dbl_p1p1.S
similarity index 93%
rename from ed25519/amd64-51-30k/ge25519_dbl_p1p1.s
rename to ed25519/amd64-51-30k/ge25519_dbl_p1p1.S
index 07c7d6e..609203e 100644
--- a/ed25519/amd64-51-30k/ge25519_dbl_p1p1.s
+++ b/ed25519/amd64-51-30k/ge25519_dbl_p1p1.S
@@ -241,13 +241,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_dbl_p1p1:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1)
+.globl CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1)
+_CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1):
+CRYPTO_NAMESPACE(batch_ge25519_dbl_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $224,%r11
@@ -648,10 +648,10 @@ add  %rax,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r14
 adc %rdx,%r14
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   squarer01 = (squarer01.a0) << 13
 # asm 1: shld $13,<a0=int64#4,<squarer01=int64#5
@@ -1223,10 +1223,10 @@ add  %rax,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r14
 adc %rdx,%r14
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   squarer01 = (squarer01.b0) << 13
 # asm 1: shld $13,<b0=int64#4,<squarer01=int64#5
@@ -1798,10 +1798,10 @@ add  %rax,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r14
 adc %rdx,%r14
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   squarer01 = (squarer01.c0) << 13
 # asm 1: shld $13,<c0=int64#4,<squarer01=int64#5
@@ -2038,30 +2038,30 @@ movq %r10,160(%rsp)
 # asm 2: movq <c4=%r11,>c4_stack=168(%rsp)
 movq %r11,168(%rsp)
 
-# qhasm: d0 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,>d0=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,>d0=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: d0 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P0),>d0=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P0),>d0=%rdx
+movq CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: d1 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d1=int64#4
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d1=%rcx
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: d1 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>d1=int64#4
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>d1=%rcx
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: d2 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d2=int64#5
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d2=%r8
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: d2 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>d2=int64#5
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>d2=%r8
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: d3 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d3=int64#6
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d3=%r9
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: d3 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>d3=int64#6
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>d3=%r9
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: d4 = *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d4=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,>d4=%rax
-movq crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: d4 = *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: movq CRYPTO_NAMESPACE(batch_2P1234),>d4=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(batch_2P1234),>d4=%rax
+movq CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
 # qhasm: e0 = d0
 # asm 1: mov  <d0=int64#3,>e0=int64#8
@@ -2263,30 +2263,30 @@ movq   %r13,64(%rdi)
 # asm 2: movq   <rz4=%r14,72(<rp=%rdi)
 movq   %r14,72(%rdi)
 
-# qhasm: d0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<d0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<d0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: d0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<d0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<d0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: d1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d1=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d1=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: d1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<d1=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<d1=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: d2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d2=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d2=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: d2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<d2=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<d2=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: d3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d3=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d3=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: d3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<d3=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<d3=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: d4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d4=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<d4=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: d4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<d4=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<d4=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
 # qhasm: d0 -= b0_stack
 # asm 1: subq <b0_stack=stack64#13,<d0=int64#3
@@ -2338,30 +2338,30 @@ movq   %r9,104(%rdi)
 # asm 2: movq   <d4=%rax,112(<rp=%rdi)
 movq   %rax,112(%rdi)
 
-# qhasm: rz0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_4P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_4P0,<rz0=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_4P0,<rz0=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_4P0,%r10
+# qhasm: rz0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_4P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_4P0),<rz0=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_4P0),<rz0=%r10
+add  CRYPTO_NAMESPACE(batch_4P0)(%rip),%r10
 
-# qhasm: rz1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_4P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz1=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz1=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,%r11
+# qhasm: rz1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_4P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_4P1234),<rz1=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_4P1234),<rz1=%r11
+add  CRYPTO_NAMESPACE(batch_4P1234)(%rip),%r11
 
-# qhasm: rz2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_4P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz2=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz2=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,%r12
+# qhasm: rz2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_4P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_4P1234),<rz2=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_4P1234),<rz2=%r12
+add  CRYPTO_NAMESPACE(batch_4P1234)(%rip),%r12
 
-# qhasm: rz3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_4P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz3=int64#11
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz3=%r13
-add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,%r13
+# qhasm: rz3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_4P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_4P1234),<rz3=int64#11
+# asm 2: add  CRYPTO_NAMESPACE(batch_4P1234),<rz3=%r13
+add  CRYPTO_NAMESPACE(batch_4P1234)(%rip),%r13
 
-# qhasm: rz4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_4P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz4=int64#12
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,<rz4=%r14
-add  crypto_sign_ed25519_amd64_51_30k_batch_4P1234,%r14
+# qhasm: rz4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_4P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_4P1234),<rz4=int64#12
+# asm 2: add  CRYPTO_NAMESPACE(batch_4P1234),<rz4=%r14
+add  CRYPTO_NAMESPACE(batch_4P1234)(%rip),%r14
 
 # qhasm: rz0 -= c0_stack
 # asm 1: subq <c0_stack=stack64#18,<rz0=int64#8
@@ -2848,10 +2848,10 @@ add  %rax,%r12
 # asm 2: adc <squarerdx=%rdx,<squarer31=%r13
 adc %rdx,%r13
 
-# qhasm:   squareredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>squareredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   squareredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>squareredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   squarer01 = (squarer01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#2,<squarer01=int64#4
diff --git a/ed25519/amd64-51-30k/ge25519_double_scalarmult.c b/ed25519/amd64-51-30k/ge25519_double_scalarmult.c
index 54ec027..b82067a 100644
--- a/ed25519/amd64-51-30k/ge25519_double_scalarmult.c
+++ b/ed25519/amd64-51-30k/ge25519_double_scalarmult.c
@@ -7,7 +7,7 @@
 #define S2_SWINDOWSIZE 7
 #define PRE2_SIZE (1<<(S2_SWINDOWSIZE-2))
 
-ge25519_niels pre2[PRE2_SIZE] = {
+static const ge25519_niels pre2[PRE2_SIZE] = {
 #include "ge25519_base_slide_multiples.data"
 };
 
diff --git a/ed25519/amd64-51-30k/ge25519_nielsadd2.s b/ed25519/amd64-51-30k/ge25519_nielsadd2.S
similarity index 96%
rename from ed25519/amd64-51-30k/ge25519_nielsadd2.s
rename to ed25519/amd64-51-30k/ge25519_nielsadd2.S
index 8b94f2b..cc1c6cb 100644
--- a/ed25519/amd64-51-30k/ge25519_nielsadd2.s
+++ b/ed25519/amd64-51-30k/ge25519_nielsadd2.S
@@ -333,13 +333,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_nielsadd2)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd2:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_nielsadd2)
+.globl CRYPTO_NAMESPACE(batch_ge25519_nielsadd2)
+_CRYPTO_NAMESPACE(batch_ge25519_nielsadd2):
+CRYPTO_NAMESPACE(batch_ge25519_nielsadd2):
 mov %rsp,%r11
 and $31,%r11
 add $256,%r11
@@ -430,30 +430,30 @@ mov  %r9,%r13
 # asm 2: mov  <a4=%rax,>b4=%r14
 mov  %rax,%r14
 
-# qhasm: a0 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: a0 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<a0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<a0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: a1 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: a1 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: a2 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: a2 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: a3 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: a3 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: a4 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: a4 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
 # qhasm: b0 += *(uint64 *) (rp + 0)
 # asm 1: addq 0(<rp=int64#1),<b0=int64#8
@@ -1090,10 +1090,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.a0) << 13
 # asm 1: shld $13,<a0=int64#4,<mulr01=int64#5
@@ -1840,10 +1840,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.e0) << 13
 # asm 1: shld $13,<e0=int64#4,<mulr01=int64#5
@@ -2055,30 +2055,30 @@ mov  %r10,%r13
 # asm 2: mov  <e4=%r11,>h4=%r14
 mov  %r11,%r14
 
-# qhasm: e0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<e0=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<e0=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rcx
+# qhasm: e0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<e0=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<e0=%rcx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rcx
 
-# qhasm: e1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e1=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e1=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: e1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e1=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e1=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: e2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e2=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e2=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: e2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e2=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e2=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: e3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e3=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e3=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: e3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e3=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e3=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
-# qhasm: e4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e4=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e4=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r11
+# qhasm: e4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e4=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e4=%r11
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r11
 
 # qhasm: h0 += a0_stack
 # asm 1: addq <a0_stack=stack64#8,<h0=int64#3
@@ -2715,10 +2715,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.c0) << 13
 # asm 1: shld $13,<c0=int64#4,<mulr01=int64#5
@@ -2985,30 +2985,30 @@ mov  %r11,%rbx
 # asm 2: mov  <f4=%r12,>g4=%rbp
 mov  %r12,%rbp
 
-# qhasm: f0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<f0=int64#2
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<f0=%rsi
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rsi
+# qhasm: f0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<f0=int64#2
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<f0=%rsi
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rsi
 
-# qhasm: f1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f1=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f1=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rdx
+# qhasm: f1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f1=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f1=%rdx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rdx
 
-# qhasm: f2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f2=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f2=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: f2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f2=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f2=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: f3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f3=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f3=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r11
+# qhasm: f3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f3=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f3=%r11
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r11
 
-# qhasm: f4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f4=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f4=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: f4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f4=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f4=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
 # qhasm: g0 += c0_stack
 # asm 1: addq <c0_stack=stack64#18,<g0=int64#11
@@ -3645,10 +3645,10 @@ add  %rax,%r12
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r13
 adc %rdx,%r13
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#2,<mulr01=int64#4
@@ -4395,10 +4395,10 @@ add  %rax,%r12
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r13
 adc %rdx,%r13
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.ry0) << 13
 # asm 1: shld $13,<ry0=int64#2,<mulr01=int64#4
@@ -5145,10 +5145,10 @@ add  %rax,%r12
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r13
 adc %rdx,%r13
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rz0) << 13
 # asm 1: shld $13,<rz0=int64#2,<mulr01=int64#4
@@ -5895,10 +5895,10 @@ add  %rax,%r12
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r13
 adc %rdx,%r13
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rt0) << 13
 # asm 1: shld $13,<rt0=int64#2,<mulr01=int64#4
diff --git a/ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.s b/ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.S
similarity index 93%
rename from ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.s
rename to ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.S
index b136ffe..f4dabd6 100644
--- a/ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.s
+++ b/ed25519/amd64-51-30k/ge25519_nielsadd_p1p1.S
@@ -337,13 +337,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_nielsadd_p1p1:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1)
+.globl CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1)
+_CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1):
+CRYPTO_NAMESPACE(batch_ge25519_nielsadd_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $160,%r11
@@ -439,30 +439,30 @@ mov  %rax,%r14
 # asm 2: mov  <a4=%r10,>b4=%r15
 mov  %r10,%r15
 
-# qhasm: a0 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: a0 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<a0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<a0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: a1 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: a1 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: a2 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: a2 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: a3 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: a3 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: a4 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: a4 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: b0 += *(uint64 *) (pp + 0)
 # asm 1: addq 0(<pp=int64#2),<b0=int64#9
@@ -1099,10 +1099,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.a0) << 13
 # asm 1: shld $13,<a0=int64#5,<mulr01=int64#6
@@ -1849,10 +1849,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.e0) << 13
 # asm 1: shld $13,<e0=int64#5,<mulr01=int64#6
@@ -2064,30 +2064,30 @@ mov  %r11,%r14
 # asm 2: mov  <e4=%r12,>h4=%r15
 mov  %r12,%r15
 
-# qhasm: e0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<e0=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<e0=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%r8
+# qhasm: e0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<e0=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<e0=%r8
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%r8
 
-# qhasm: e1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e1=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e1=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: e1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e1=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e1=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: e2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e2=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e2=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: e2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e2=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e2=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
-# qhasm: e3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e3=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e3=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r11
+# qhasm: e3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e3=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e3=%r11
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r11
 
-# qhasm: e4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e4=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<e4=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: e4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<e4=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<e4=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
 # qhasm: h0 += a0_stack
 # asm 1: addq <a0_stack=stack64#8,<h0=int64#3
@@ -2724,10 +2724,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.c0) << 13
 # asm 1: shld $13,<c0=int64#5,<mulr01=int64#6
@@ -2994,30 +2994,30 @@ mov  %r12,%rbx
 # asm 2: mov  <f4=%rsi,>g4=%rbp
 mov  %rsi,%rbp
 
-# qhasm: f0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<f0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<f0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: f0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<f0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<f0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: f1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f1=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f1=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: f1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f1=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f1=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: f2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f2=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f2=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: f2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f2=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f2=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: f3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f3=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f3=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: f3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f3=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f3=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
-# qhasm: f4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f4=int64#2
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<f4=%rsi
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rsi
+# qhasm: f4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<f4=int64#2
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<f4=%rsi
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rsi
 
 # qhasm: g0 += c0_stack
 # asm 1: addq <c0_stack=stack64#8,<g0=int64#11
diff --git a/ed25519/amd64-51-30k/ge25519_p1p1_to_p2.s b/ed25519/amd64-51-30k/ge25519_p1p1_to_p2.S
similarity index 98%
rename from ed25519/amd64-51-30k/ge25519_p1p1_to_p2.s
rename to ed25519/amd64-51-30k/ge25519_p1p1_to_p2.S
index cea50dd..3be923b 100644
--- a/ed25519/amd64-51-30k/ge25519_p1p1_to_p2.s
+++ b/ed25519/amd64-51-30k/ge25519_p1p1_to_p2.S
@@ -103,13 +103,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p2:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2)
+.globl CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2)
+_CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2):
+CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p2):
 mov %rsp,%r11
 and $31,%r11
 add $96,%r11
@@ -685,10 +685,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#4,<mulr01=int64#5
@@ -1435,10 +1435,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.ry0) << 13
 # asm 1: shld $13,<ry0=int64#4,<mulr01=int64#5
@@ -2185,10 +2185,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.rz0) << 13
 # asm 1: shld $13,<rz0=int64#4,<mulr01=int64#5
diff --git a/ed25519/amd64-51-30k/ge25519_p1p1_to_p3.s b/ed25519/amd64-51-30k/ge25519_p1p1_to_p3.S
similarity index 98%
rename from ed25519/amd64-51-30k/ge25519_p1p1_to_p3.s
rename to ed25519/amd64-51-30k/ge25519_p1p1_to_p3.S
index 86a95d0..4650678 100644
--- a/ed25519/amd64-51-30k/ge25519_p1p1_to_p3.s
+++ b/ed25519/amd64-51-30k/ge25519_p1p1_to_p3.S
@@ -113,13 +113,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_p3:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3)
+.globl CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3)
+_CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3):
+CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_p3):
 mov %rsp,%r11
 and $31,%r11
 add $96,%r11
@@ -695,10 +695,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#4,<mulr01=int64#5
@@ -1445,10 +1445,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.ry0) << 13
 # asm 1: shld $13,<ry0=int64#4,<mulr01=int64#5
@@ -2195,10 +2195,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rz0) << 13
 # asm 1: shld $13,<rz0=int64#4,<mulr01=int64#5
@@ -2945,10 +2945,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.rt0) << 13
 # asm 1: shld $13,<rt0=int64#4,<mulr01=int64#5
diff --git a/ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.s b/ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.S
similarity index 93%
rename from ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.s
rename to ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.S
index 1f24615..d31592d 100644
--- a/ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.s
+++ b/ed25519/amd64-51-30k/ge25519_p1p1_to_pniels.S
@@ -171,13 +171,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_p1p1_to_pniels:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels)
+.globl CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels)
+_CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels):
+CRYPTO_NAMESPACE(batch_ge25519_p1p1_to_pniels):
 mov %rsp,%r11
 and $31,%r11
 add $128,%r11
@@ -753,10 +753,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.x0) << 13
 # asm 1: shld $13,<x0=int64#4,<mulr01=int64#5
@@ -1503,10 +1503,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.y0) << 13
 # asm 1: shld $13,<y0=int64#4,<mulr01=int64#5
@@ -1718,30 +1718,30 @@ mov  %r10,%r13
 # asm 2: mov  <y4=%r11,>ysubx4=%r14
 mov  %r11,%r14
 
-# qhasm: ysubx0 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<ysubx0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<ysubx0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: ysubx0 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<ysubx0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<ysubx0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: ysubx1 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx1=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx1=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: ysubx1 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx1=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx1=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: ysubx2 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx2=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx2=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: ysubx2 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx2=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx2=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
-# qhasm: ysubx3 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx3=int64#11
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx3=%r13
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r13
+# qhasm: ysubx3 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx3=int64#11
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx3=%r13
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r13
 
-# qhasm: ysubx4 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx4=int64#12
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<ysubx4=%r14
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r14
+# qhasm: ysubx4 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx4=int64#12
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<ysubx4=%r14
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r14
 
 # qhasm: x0 = stackx0
 # asm 1: movq <stackx0=stack64#8,>x0=int64#13
@@ -2403,10 +2403,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rz0) << 13
 # asm 1: shld $13,<rz0=int64#4,<mulr01=int64#5
@@ -3153,10 +3153,10 @@ add  %rax,%r13
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r14
 adc %rdx,%r14
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.t0) << 13
 # asm 1: shld $13,<t0=int64#4,<mulr01=int64#5
@@ -3383,8 +3383,8 @@ imulq  $19,%rsi,%rax
 # asm 2: movq <mulrax=%rax,>mulx319_stack=96(%rsp)
 movq %rax,96(%rsp)
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   t2d0 = mulrax
 # asm 1: mov  <mulrax=int64#7,>t2d0=int64#2
@@ -3411,8 +3411,8 @@ imulq  $19,%rdx,%rax
 # asm 2: movq <mulrax=%rax,>mulx419_stack=104(%rsp)
 movq %rax,104(%rsp)
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? t2d0 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d0=int64#2
@@ -3429,8 +3429,8 @@ adc %rdx,%rcx
 # asm 2: movq <stackt0=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? t2d0 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d0=int64#2
@@ -3447,8 +3447,8 @@ adc %rdx,%rcx
 # asm 2: movq <stackt0=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   t2d1 = mulrax
 # asm 1: mov  <mulrax=int64#7,>t2d1=int64#5
@@ -3465,8 +3465,8 @@ mov  %rdx,%r9
 # asm 2: movq <stackt0=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   t2d2 = mulrax
 # asm 1: mov  <mulrax=int64#7,>t2d2=int64#8
@@ -3483,8 +3483,8 @@ mov  %rdx,%r11
 # asm 2: movq <stackt0=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   t2d3 = mulrax
 # asm 1: mov  <mulrax=int64#7,>t2d3=int64#10
@@ -3501,8 +3501,8 @@ mov  %rdx,%r13
 # asm 2: movq <stackt0=56(%rsp),>mulrax=%rax
 movq 56(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   t2d4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>t2d4=int64#12
@@ -3519,8 +3519,8 @@ mov  %rdx,%r15
 # asm 2: movq <stackt1=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? t2d1 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d1=int64#5
@@ -3537,8 +3537,8 @@ adc %rdx,%r9
 # asm 2: movq <stackt1=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? t2d2 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d2=int64#8
@@ -3555,8 +3555,8 @@ adc %rdx,%r11
 # asm 2: movq <stackt1=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? t2d3 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d3=int64#10
@@ -3573,8 +3573,8 @@ adc %rdx,%r13
 # asm 2: movq <stackt1=64(%rsp),>mulrax=%rax
 movq 64(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? t2d4 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d4=int64#12
@@ -3596,8 +3596,8 @@ movq 64(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? t2d0 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d0=int64#2
@@ -3614,8 +3614,8 @@ adc %rdx,%rcx
 # asm 2: movq <stackt2=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? t2d2 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d2=int64#8
@@ -3632,8 +3632,8 @@ adc %rdx,%r11
 # asm 2: movq <stackt2=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? t2d3 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d3=int64#10
@@ -3650,8 +3650,8 @@ adc %rdx,%r13
 # asm 2: movq <stackt2=72(%rsp),>mulrax=%rax
 movq 72(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? t2d4 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d4=int64#12
@@ -3673,8 +3673,8 @@ movq 72(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? t2d0 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d0=int64#2
@@ -3696,8 +3696,8 @@ movq 72(%rsp),%rdx
 # asm 2: imulq  $19,<mulrax=%rdx,>mulrax=%rax
 imulq  $19,%rdx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? t2d1 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d1=int64#5
@@ -3714,8 +3714,8 @@ adc %rdx,%r9
 # asm 2: movq <stackt3=80(%rsp),>mulrax=%rax
 movq 80(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? t2d3 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d3=int64#10
@@ -3732,8 +3732,8 @@ adc %rdx,%r13
 # asm 2: movq <stackt3=80(%rsp),>mulrax=%rax
 movq 80(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D1
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D1)
+mulq CRYPTO_NAMESPACE(batch_EC2D1)(%rip)
 
 # qhasm:   carry? t2d4 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d4=int64#12
@@ -3750,8 +3750,8 @@ adc %rdx,%r15
 # asm 2: movq <mulx319_stack=96(%rsp),>mulrax=%rax
 movq 96(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? t2d1 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d1=int64#5
@@ -3768,8 +3768,8 @@ adc %rdx,%r9
 # asm 2: movq <mulx319_stack=96(%rsp),>mulrax=%rax
 movq 96(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? t2d2 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d2=int64#8
@@ -3786,8 +3786,8 @@ adc %rdx,%r11
 # asm 2: movq <stackt4=88(%rsp),>mulrax=%rax
 movq 88(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D0
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D0)
+mulq CRYPTO_NAMESPACE(batch_EC2D0)(%rip)
 
 # qhasm:   carry? t2d4 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d4=int64#12
@@ -3804,8 +3804,8 @@ adc %rdx,%r15
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D2
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D2)
+mulq CRYPTO_NAMESPACE(batch_EC2D2)(%rip)
 
 # qhasm:   carry? t2d1 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d1=int64#5
@@ -3822,8 +3822,8 @@ adc %rdx,%r9
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D3
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D3)
+mulq CRYPTO_NAMESPACE(batch_EC2D3)(%rip)
 
 # qhasm:   carry? t2d2 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d2=int64#8
@@ -3840,8 +3840,8 @@ adc %rdx,%r11
 # asm 2: movq <mulx419_stack=104(%rsp),>mulrax=%rax
 movq 104(%rsp),%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_EC2D4
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(batch_EC2D4)
+mulq CRYPTO_NAMESPACE(batch_EC2D4)(%rip)
 
 # qhasm:   carry? t2d3 += mulrax
 # asm 1: add  <mulrax=int64#7,<t2d3=int64#10
@@ -3853,10 +3853,10 @@ add  %rax,%r12
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r13
 adc %rdx,%r13
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.t2d0) << 13
 # asm 1: shld $13,<t2d0=int64#2,<mulr01=int64#4
diff --git a/ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.s b/ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.S
similarity index 94%
rename from ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.s
rename to ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.S
index 512af25..610e06f 100644
--- a/ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.s
+++ b/ed25519/amd64-51-30k/ge25519_pnielsadd_p1p1.S
@@ -247,13 +247,13 @@
 
 # qhasm: stack64 mulx419_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1
-_crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1:
-crypto_sign_ed25519_amd64_51_30k_batch_ge25519_pnielsadd_p1p1:
+.globl _CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1)
+.globl CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1)
+_CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1):
+CRYPTO_NAMESPACE(batch_ge25519_pnielsadd_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $160,%r11
@@ -349,30 +349,30 @@ mov  %rax,%r14
 # asm 2: mov  <a4=%r10,>b4=%r15
 mov  %r10,%r15
 
-# qhasm: a0 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=int64#3
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<a0=%rdx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%rdx
+# qhasm: a0 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<a0=int64#3
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<a0=%rdx
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%rdx
 
-# qhasm: a1 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a1=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r8
+# qhasm: a1 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a1=%r8
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r8
 
-# qhasm: a2 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a2=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: a2 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a2=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: a3 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a3=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: a3 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a3=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: a4 += *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<a4=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: a4 += *(uint64 *) &CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<a4=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: b0 += *(uint64 *) (pp + 0)
 # asm 1: addq 0(<pp=int64#2),<b0=int64#9
@@ -1009,10 +1009,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.a0) << 13
 # asm 1: shld $13,<a0=int64#5,<mulr01=int64#6
@@ -1759,10 +1759,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.rx0) << 13
 # asm 1: shld $13,<rx0=int64#5,<mulr01=int64#6
@@ -1974,30 +1974,30 @@ mov  %r11,%r14
 # asm 2: mov  <rx4=%r12,>ry4=%r15
 mov  %r12,%r15
 
-# qhasm: rx0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rx0=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rx0=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%r8
+# qhasm: rx0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<rx0=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<rx0=%r8
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%r8
 
-# qhasm: rx1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx1=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx1=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: rx1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx1=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx1=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: rx2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx2=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx2=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: rx2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx2=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx2=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
-# qhasm: rx3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx3=int64#9
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx3=%r11
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r11
+# qhasm: rx3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx3=int64#9
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx3=%r11
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r11
 
-# qhasm: rx4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx4=int64#10
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rx4=%r12
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r12
+# qhasm: rx4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rx4=int64#10
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rx4=%r12
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r12
 
 # qhasm: ry0 += a0_stack
 # asm 1: addq <a0_stack=stack64#8,<ry0=int64#3
@@ -2634,10 +2634,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#3
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rdx
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rdx
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#3
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rdx
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rdx
 
 # qhasm:   mulr01 = (mulr01.c0) << 13
 # asm 1: shld $13,<c0=int64#5,<mulr01=int64#6
@@ -3384,10 +3384,10 @@ add  %rax,%r14
 # asm 2: adc <mulrdx=%rdx,<mulr31=%r15
 adc %rdx,%r15
 
-# qhasm:   mulredmask = *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51
-# asm 1: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=int64#2
-# asm 2: movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,>mulredmask=%rsi
-movq crypto_sign_ed25519_amd64_51_30k_batch_REDMASK51,%rsi
+# qhasm:   mulredmask = *(uint64 *) &CRYPTO_NAMESPACE(batch_REDMASK51)
+# asm 1: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=int64#2
+# asm 2: movq CRYPTO_NAMESPACE(batch_REDMASK51),>mulredmask=%rsi
+movq CRYPTO_NAMESPACE(batch_REDMASK51)(%rip),%rsi
 
 # qhasm:   mulr01 = (mulr01.rt0) << 13
 # asm 1: shld $13,<rt0=int64#5,<mulr01=int64#6
@@ -3624,30 +3624,30 @@ mov  %rax,%r12
 # asm 2: mov  <rt4=%r10,>rz4=%r13
 mov  %r10,%r13
 
-# qhasm: rt0 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P0
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rt0=int64#5
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,<rt0=%r8
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P0,%r8
+# qhasm: rt0 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P0)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P0),<rt0=int64#5
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P0),<rt0=%r8
+add  CRYPTO_NAMESPACE(batch_2P0)(%rip),%r8
 
-# qhasm: rt1 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt1=int64#4
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt1=%rcx
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rcx
+# qhasm: rt1 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt1=int64#4
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt1=%rcx
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rcx
 
-# qhasm: rt2 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt2=int64#6
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt2=%r9
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r9
+# qhasm: rt2 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt2=int64#6
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt2=%r9
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r9
 
-# qhasm: rt3 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt3=int64#7
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt3=%rax
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%rax
+# qhasm: rt3 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt3=int64#7
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt3=%rax
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%rax
 
-# qhasm: rt4 += *(uint64 *)&crypto_sign_ed25519_amd64_51_30k_batch_2P1234
-# asm 1: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt4=int64#8
-# asm 2: add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,<rt4=%r10
-add  crypto_sign_ed25519_amd64_51_30k_batch_2P1234,%r10
+# qhasm: rt4 += *(uint64 *)&CRYPTO_NAMESPACE(batch_2P1234)
+# asm 1: add  CRYPTO_NAMESPACE(batch_2P1234),<rt4=int64#8
+# asm 2: add  CRYPTO_NAMESPACE(batch_2P1234),<rt4=%r10
+add  CRYPTO_NAMESPACE(batch_2P1234)(%rip),%r10
 
 # qhasm: rz0 += c0_stack
 # asm 1: addq <c0_stack=stack64#8,<rz0=int64#2
diff --git a/ed25519/amd64-64-24k/heap_rootreplaced.s b/ed25519/amd64-51-30k/heap_rootreplaced.S
similarity index 97%
rename from ed25519/amd64-64-24k/heap_rootreplaced.s
rename to ed25519/amd64-51-30k/heap_rootreplaced.S
index 8fe385b..ebf9a45 100644
--- a/ed25519/amd64-64-24k/heap_rootreplaced.s
+++ b/ed25519/amd64-51-30k/heap_rootreplaced.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced
+# qhasm: enter CRYPTO_NAMESPACE(batch_heap_rootreplaced)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced:
+.globl _CRYPTO_NAMESPACE(batch_heap_rootreplaced)
+.globl CRYPTO_NAMESPACE(batch_heap_rootreplaced)
+_CRYPTO_NAMESPACE(batch_heap_rootreplaced):
+CRYPTO_NAMESPACE(batch_heap_rootreplaced):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/heap_rootreplaced_1limb.s b/ed25519/amd64-51-30k/heap_rootreplaced_1limb.S
similarity index 96%
rename from ed25519/amd64-64-24k/heap_rootreplaced_1limb.s
rename to ed25519/amd64-51-30k/heap_rootreplaced_1limb.S
index 488e9c5..275fe43 100644
--- a/ed25519/amd64-64-24k/heap_rootreplaced_1limb.s
+++ b/ed25519/amd64-51-30k/heap_rootreplaced_1limb.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
+# qhasm: enter CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb:
+.globl _CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb)
+.globl CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb)
+_CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb):
+CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/heap_rootreplaced_2limbs.s b/ed25519/amd64-51-30k/heap_rootreplaced_2limbs.S
similarity index 96%
rename from ed25519/amd64-64-24k/heap_rootreplaced_2limbs.s
rename to ed25519/amd64-51-30k/heap_rootreplaced_2limbs.S
index f925918..77c6bc0 100644
--- a/ed25519/amd64-64-24k/heap_rootreplaced_2limbs.s
+++ b/ed25519/amd64-51-30k/heap_rootreplaced_2limbs.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
+# qhasm: enter CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs:
+.globl _CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs)
+.globl CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs)
+_CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs):
+CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/heap_rootreplaced_3limbs.s b/ed25519/amd64-51-30k/heap_rootreplaced_3limbs.S
similarity index 97%
rename from ed25519/amd64-64-24k/heap_rootreplaced_3limbs.s
rename to ed25519/amd64-51-30k/heap_rootreplaced_3limbs.S
index dcf890e..7d59fe3 100644
--- a/ed25519/amd64-64-24k/heap_rootreplaced_3limbs.s
+++ b/ed25519/amd64-51-30k/heap_rootreplaced_3limbs.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
+# qhasm: enter CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs:
+.globl _CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs)
+.globl CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs)
+_CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs):
+CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-51-30k/hram.h b/ed25519/amd64-51-30k/hram.h
index 8cffd84..650926e 100644
--- a/ed25519/amd64-51-30k/hram.h
+++ b/ed25519/amd64-51-30k/hram.h
@@ -1,7 +1,7 @@
 #ifndef HRAM_H
 #define HRAM_H
 
-#define get_hram crypto_sign_ed25519_amd64_51_30k_batch_get_hram
+#define get_hram CRYPTO_NAMESPACE(batch_get_hram)
 
 extern void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen);
 
diff --git a/ed25519/amd64-51-30k/index_heap.h b/ed25519/amd64-51-30k/index_heap.h
index 8c35195..24c5baf 100644
--- a/ed25519/amd64-51-30k/index_heap.h
+++ b/ed25519/amd64-51-30k/index_heap.h
@@ -3,15 +3,15 @@
 
 #include "sc25519.h"
 
-#define heap_init                crypto_sign_ed25519_amd64_51_30k_batch_heap_init
-#define heap_extend              crypto_sign_ed25519_amd64_51_30k_batch_heap_extend
-#define heap_pop                 crypto_sign_ed25519_amd64_51_30k_batch_heap_pop
-#define heap_push                crypto_sign_ed25519_amd64_51_30k_batch_heap_push
-#define heap_get2max             crypto_sign_ed25519_amd64_51_30k_batch_heap_get2max
-#define heap_rootreplaced        crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced
-#define heap_rootreplaced_3limbs crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs
-#define heap_rootreplaced_2limbs crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs
-#define heap_rootreplaced_1limb  crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb
+#define heap_init                CRYPTO_NAMESPACE(batch_heap_init)
+#define heap_extend              CRYPTO_NAMESPACE(batch_heap_extend)
+#define heap_pop                 CRYPTO_NAMESPACE(batch_heap_pop)
+#define heap_push                CRYPTO_NAMESPACE(batch_heap_push)
+#define heap_get2max             CRYPTO_NAMESPACE(batch_heap_get2max)
+#define heap_rootreplaced        CRYPTO_NAMESPACE(batch_heap_rootreplaced)
+#define heap_rootreplaced_3limbs CRYPTO_NAMESPACE(batch_heap_rootreplaced_3limbs)
+#define heap_rootreplaced_2limbs CRYPTO_NAMESPACE(batch_heap_rootreplaced_2limbs)
+#define heap_rootreplaced_1limb  CRYPTO_NAMESPACE(batch_heap_rootreplaced_1limb)
 
 void heap_init(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
 
diff --git a/ed25519/amd64-51-30k/sc25519.h b/ed25519/amd64-51-30k/sc25519.h
index 9aa705c..600b240 100644
--- a/ed25519/amd64-51-30k/sc25519.h
+++ b/ed25519/amd64-51-30k/sc25519.h
@@ -1,25 +1,25 @@
 #ifndef SC25519_H
 #define SC25519_H
 
-#define sc25519                  crypto_sign_ed25519_amd64_51_30k_batch_sc25519
-#define shortsc25519             crypto_sign_ed25519_amd64_51_30k_batch_shortsc25519
-#define sc25519_from32bytes      crypto_sign_ed25519_amd64_51_30k_batch_sc25519_from32bytes
-#define shortsc25519_from16bytes crypto_sign_ed25519_amd64_51_30k_batch_shortsc25519_from16bytes
-#define sc25519_from64bytes      crypto_sign_ed25519_amd64_51_30k_batch_sc25519_from64bytes
-#define sc25519_from_shortsc     crypto_sign_ed25519_amd64_51_30k_batch_sc25519_from_shortsc
-#define sc25519_to32bytes        crypto_sign_ed25519_amd64_51_30k_batch_sc25519_to32bytes
-#define sc25519_iszero_vartime   crypto_sign_ed25519_amd64_51_30k_batch_sc25519_iszero_vartime
-#define sc25519_isshort_vartime  crypto_sign_ed25519_amd64_51_30k_batch_sc25519_isshort_vartime
-#define sc25519_lt               crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt
-#define sc25519_add              crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add
-#define sc25519_sub_nored        crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored
-#define sc25519_mul              crypto_sign_ed25519_amd64_51_30k_batch_sc25519_mul
-#define sc25519_mul_shortsc      crypto_sign_ed25519_amd64_51_30k_batch_sc25519_mul_shortsc
-#define sc25519_window4          crypto_sign_ed25519_amd64_51_30k_batch_sc25519_window4
-#define sc25519_window5          crypto_sign_ed25519_amd64_51_30k_batch_sc25519_window5
-#define sc25519_slide           crypto_sign_ed25519_amd64_51_30k_batch_sc25519_slide
-#define sc25519_2interleave2     crypto_sign_ed25519_amd64_51_30k_batch_sc25519_2interleave2
-#define sc25519_barrett crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett
+#define sc25519                  CRYPTO_NAMESPACE(batch_sc25519)
+#define shortsc25519             CRYPTO_NAMESPACE(batch_shortsc25519)
+#define sc25519_from32bytes      CRYPTO_NAMESPACE(batch_sc25519_from32bytes)
+#define shortsc25519_from16bytes CRYPTO_NAMESPACE(batch_shortsc25519_from16bytes)
+#define sc25519_from64bytes      CRYPTO_NAMESPACE(batch_sc25519_from64bytes)
+#define sc25519_from_shortsc     CRYPTO_NAMESPACE(batch_sc25519_from_shortsc)
+#define sc25519_to32bytes        CRYPTO_NAMESPACE(batch_sc25519_to32bytes)
+#define sc25519_iszero_vartime   CRYPTO_NAMESPACE(batch_sc25519_iszero_vartime)
+#define sc25519_isshort_vartime  CRYPTO_NAMESPACE(batch_sc25519_isshort_vartime)
+#define sc25519_lt               CRYPTO_NAMESPACE(batch_sc25519_lt)
+#define sc25519_add              CRYPTO_NAMESPACE(batch_sc25519_add)
+#define sc25519_sub_nored        CRYPTO_NAMESPACE(batch_sc25519_sub_nored)
+#define sc25519_mul              CRYPTO_NAMESPACE(batch_sc25519_mul)
+#define sc25519_mul_shortsc      CRYPTO_NAMESPACE(batch_sc25519_mul_shortsc)
+#define sc25519_window4          CRYPTO_NAMESPACE(batch_sc25519_window4)
+#define sc25519_window5          CRYPTO_NAMESPACE(batch_sc25519_window5)
+#define sc25519_slide           CRYPTO_NAMESPACE(batch_sc25519_slide)
+#define sc25519_2interleave2     CRYPTO_NAMESPACE(batch_sc25519_2interleave2)
+#define sc25519_barrett CRYPTO_NAMESPACE(batch_sc25519_barrett)
 
 typedef struct 
 {
diff --git a/ed25519/amd64-64-24k/sc25519_add.s b/ed25519/amd64-51-30k/sc25519_add.S
similarity index 78%
rename from ed25519/amd64-64-24k/sc25519_add.s
rename to ed25519/amd64-51-30k/sc25519_add.S
index 71de002..9a6bd2a 100644
--- a/ed25519/amd64-64-24k/sc25519_add.s
+++ b/ed25519/amd64-51-30k/sc25519_add.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_add
+# qhasm: enter CRYPTO_NAMESPACE(batch_sc25519_add)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_add
-.globl crypto_sign_ed25519_amd64_64_sc25519_add
-_crypto_sign_ed25519_amd64_64_sc25519_add:
-crypto_sign_ed25519_amd64_64_sc25519_add:
+.globl _CRYPTO_NAMESPACE(batch_sc25519_add)
+.globl CRYPTO_NAMESPACE(batch_sc25519_add)
+_CRYPTO_NAMESPACE(batch_sc25519_add):
+CRYPTO_NAMESPACE(batch_sc25519_add):
 mov %rsp,%r11
 and $31,%r11
 add $32,%r11
@@ -150,25 +150,25 @@ mov  %r9,%r10
 # asm 2: mov  <r3=%rsi,>t3=%r14
 mov  %rsi,%r14
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#3
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rdx
-sub  crypto_sign_ed25519_amd64_64_ORDER0,%rdx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=int64#3
+# asm 2: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=%rdx
+sub  CRYPTO_NAMESPACE(batch_ORDER0)(%rip),%rdx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#7
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%rax
-sbb  crypto_sign_ed25519_amd64_64_ORDER1,%rax
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=int64#7
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=%rax
+sbb  CRYPTO_NAMESPACE(batch_ORDER1)(%rip),%rax
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(batch_ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#12
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r14
-sbb  crypto_sign_ed25519_amd64_64_ORDER3,%r14
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=int64#12
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=%r14
+sbb  CRYPTO_NAMESPACE(batch_ORDER3)(%rip),%r14
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#3,<r0=int64#4
diff --git a/ed25519/amd64-64-24k/sc25519_barrett.s b/ed25519/amd64-51-30k/sc25519_barrett.S
similarity index 80%
rename from ed25519/amd64-64-24k/sc25519_barrett.s
rename to ed25519/amd64-51-30k/sc25519_barrett.S
index c59f456..3564ce4 100644
--- a/ed25519/amd64-64-24k/sc25519_barrett.s
+++ b/ed25519/amd64-51-30k/sc25519_barrett.S
@@ -107,13 +107,13 @@
 
 # qhasm: stack64 q33_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_barrett
+# qhasm: enter CRYPTO_NAMESPACE(batch_sc25519_barrett)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_barrett
-.globl crypto_sign_ed25519_amd64_64_sc25519_barrett
-_crypto_sign_ed25519_amd64_64_sc25519_barrett:
-crypto_sign_ed25519_amd64_64_sc25519_barrett:
+.globl _CRYPTO_NAMESPACE(batch_sc25519_barrett)
+.globl CRYPTO_NAMESPACE(batch_sc25519_barrett)
+_CRYPTO_NAMESPACE(batch_sc25519_barrett):
+CRYPTO_NAMESPACE(batch_sc25519_barrett):
 mov %rsp,%r11
 and $31,%r11
 add $96,%r11
@@ -184,8 +184,8 @@ xor  %r11,%r11
 # asm 2: movq   24(<xp=%rsi),>rax=%rax
 movq   24(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU3)
+mulq CRYPTO_NAMESPACE(batch_MU3)(%rip)
 
 # qhasm: q23 = rax
 # asm 1: mov  <rax=int64#7,>q23=int64#10
@@ -202,8 +202,8 @@ mov  %rdx,%r13
 # asm 2: movq   24(<xp=%rsi),>rax=%rax
 movq   24(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU4)
+mulq CRYPTO_NAMESPACE(batch_MU4)(%rip)
 
 # qhasm: q24 = rax
 # asm 1: mov  <rax=int64#7,>q24=int64#12
@@ -225,8 +225,8 @@ adc %rdx,%r8
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU2)
+mulq CRYPTO_NAMESPACE(batch_MU2)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -248,8 +248,8 @@ adc %rdx,%r13
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU3)
+mulq CRYPTO_NAMESPACE(batch_MU3)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -281,8 +281,8 @@ adc %rdx,%r13
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU4)
+mulq CRYPTO_NAMESPACE(batch_MU4)(%rip)
 
 # qhasm: carry? q30 += rax 
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -309,8 +309,8 @@ adc %rdx,%r9
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU1)
+mulq CRYPTO_NAMESPACE(batch_MU1)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -332,8 +332,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU2)
+mulq CRYPTO_NAMESPACE(batch_MU2)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -365,8 +365,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU3)
+mulq CRYPTO_NAMESPACE(batch_MU3)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -398,8 +398,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU4)
+mulq CRYPTO_NAMESPACE(batch_MU4)(%rip)
 
 # qhasm: carry? q31 += rax 
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -426,8 +426,8 @@ adc %rdx,%r10
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU0
-mulq  crypto_sign_ed25519_amd64_64_MU0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU0)
+mulq CRYPTO_NAMESPACE(batch_MU0)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -449,8 +449,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU1)
+mulq CRYPTO_NAMESPACE(batch_MU1)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -482,8 +482,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU2)
+mulq CRYPTO_NAMESPACE(batch_MU2)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -515,8 +515,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU3)
+mulq CRYPTO_NAMESPACE(batch_MU3)(%rip)
 
 # qhasm: carry? q31 += rax
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -548,8 +548,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU4)
+mulq CRYPTO_NAMESPACE(batch_MU4)(%rip)
 
 # qhasm: carry? q32 += rax 
 # asm 1: add  <rax=int64#7,<q32=int64#8
@@ -576,8 +576,8 @@ adc %rdx,%r11
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU0
-mulq  crypto_sign_ed25519_amd64_64_MU0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU0)
+mulq CRYPTO_NAMESPACE(batch_MU0)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -601,8 +601,8 @@ adc %rdx,%r12
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU1)
+mulq CRYPTO_NAMESPACE(batch_MU1)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -639,8 +639,8 @@ movq %r8,56(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU2)
+mulq CRYPTO_NAMESPACE(batch_MU2)(%rip)
 
 # qhasm: carry? q31 += rax
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -677,8 +677,8 @@ movq %r9,64(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU3)
+mulq CRYPTO_NAMESPACE(batch_MU3)(%rip)
 
 # qhasm: carry? q32 += rax
 # asm 1: add  <rax=int64#7,<q32=int64#8
@@ -715,8 +715,8 @@ movq %r10,72(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_MU4)
+mulq CRYPTO_NAMESPACE(batch_MU4)(%rip)
 
 # qhasm: carry? q33 += rax 
 # asm 1: add  <rax=int64#7,<q33=int64#9
@@ -743,8 +743,8 @@ movq %r11,80(%rsp)
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+mulq CRYPTO_NAMESPACE(batch_ORDER0)(%rip)
 
 # qhasm: r20 = rax
 # asm 1: mov  <rax=int64#7,>r20=int64#5
@@ -761,8 +761,8 @@ mov  %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1)
+mulq CRYPTO_NAMESPACE(batch_ORDER1)(%rip)
 
 # qhasm: r21 = rax
 # asm 1: mov  <rax=int64#7,>r21=int64#8
@@ -789,8 +789,8 @@ adc %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2
-mulq  crypto_sign_ed25519_amd64_64_ORDER2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER2)
+mulq CRYPTO_NAMESPACE(batch_ORDER2)(%rip)
 
 # qhasm: r22 = rax
 # asm 1: mov  <rax=int64#7,>r22=int64#9
@@ -817,8 +817,8 @@ adc %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3
-mulq  crypto_sign_ed25519_amd64_64_ORDER3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER3)
+mulq CRYPTO_NAMESPACE(batch_ORDER3)(%rip)
 
 # qhasm: free rdx
 
@@ -837,8 +837,8 @@ add  %r9,%r12
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+mulq CRYPTO_NAMESPACE(batch_ORDER0)(%rip)
 
 # qhasm: carry? r21 += rax
 # asm 1: add  <rax=int64#7,<r21=int64#8
@@ -860,8 +860,8 @@ adc %rdx,%r9
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1)
+mulq CRYPTO_NAMESPACE(batch_ORDER1)(%rip)
 
 # qhasm: carry? r22 += rax
 # asm 1: add  <rax=int64#7,<r22=int64#9
@@ -893,8 +893,8 @@ adc %rdx,%rcx
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2
-mulq  crypto_sign_ed25519_amd64_64_ORDER2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER2)
+mulq CRYPTO_NAMESPACE(batch_ORDER2)(%rip)
 
 # qhasm: free rdx
 
@@ -913,8 +913,8 @@ add  %rcx,%r12
 # asm 2: movq <q32_stack=72(%rsp),>rax=%rax
 movq 72(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+mulq CRYPTO_NAMESPACE(batch_ORDER0)(%rip)
 
 # qhasm: carry? r22 += rax
 # asm 1: add  <rax=int64#7,<r22=int64#9
@@ -936,8 +936,8 @@ adc %rdx,%rcx
 # asm 2: movq <q32_stack=72(%rsp),>rax=%rax
 movq 72(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1)
+mulq CRYPTO_NAMESPACE(batch_ORDER1)(%rip)
 
 # qhasm: free rdx
 
@@ -956,8 +956,8 @@ add  %rcx,%r12
 # asm 2: movq <q33_stack=80(%rsp),>rax=%rax
 movq 80(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+mulq CRYPTO_NAMESPACE(batch_ORDER0)(%rip)
 
 # qhasm: free rdx
 
@@ -1026,25 +1026,25 @@ sbb  %r12,%rsi
 # asm 2: mov  <r3=%rsi,>t3=%r11
 mov  %rsi,%r11
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_64_ORDER0,%rcx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=int64#4
+# asm 2: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=%rcx
+sub  CRYPTO_NAMESPACE(batch_ORDER0)(%rip),%rcx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_64_ORDER1,%r9
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=int64#6
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=%r9
+sbb  CRYPTO_NAMESPACE(batch_ORDER1)(%rip),%r9
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(batch_ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_64_ORDER3,%r11
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=int64#9
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=%r11
+sbb  CRYPTO_NAMESPACE(batch_ORDER3)(%rip),%r11
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#4,<r0=int64#3
@@ -1086,25 +1086,25 @@ cmovae %r11,%rsi
 # asm 2: mov  <r3=%rsi,>t3=%r11
 mov  %rsi,%r11
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_64_ORDER0,%rcx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=int64#4
+# asm 2: sub  CRYPTO_NAMESPACE(batch_ORDER0),<t0=%rcx
+sub  CRYPTO_NAMESPACE(batch_ORDER0)(%rip),%rcx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_64_ORDER1,%r9
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=int64#6
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER1),<t1=%r9
+sbb  CRYPTO_NAMESPACE(batch_ORDER1)(%rip),%r9
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(batch_ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_64_ORDER3,%r11
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(batch_ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=int64#9
+# asm 2: sbb  CRYPTO_NAMESPACE(batch_ORDER3),<t3=%r11
+sbb  CRYPTO_NAMESPACE(batch_ORDER3)(%rip),%r11
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#4,<r0=int64#3
diff --git a/ed25519/amd64-64-24k/sc25519_lt.s b/ed25519/amd64-51-30k/sc25519_lt.S
similarity index 90%
rename from ed25519/amd64-64-24k/sc25519_lt.s
rename to ed25519/amd64-51-30k/sc25519_lt.S
index 3ba4317..a3087dc 100644
--- a/ed25519/amd64-64-24k/sc25519_lt.s
+++ b/ed25519/amd64-51-30k/sc25519_lt.S
@@ -57,13 +57,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_lt
+# qhasm: enter CRYPTO_NAMESPACE(batch_sc25519_lt)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_lt
-.globl crypto_sign_ed25519_amd64_64_sc25519_lt
-_crypto_sign_ed25519_amd64_64_sc25519_lt:
-crypto_sign_ed25519_amd64_64_sc25519_lt:
+.globl _CRYPTO_NAMESPACE(batch_sc25519_lt)
+.globl CRYPTO_NAMESPACE(batch_sc25519_lt)
+_CRYPTO_NAMESPACE(batch_sc25519_lt):
+CRYPTO_NAMESPACE(batch_sc25519_lt):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-51-30k/sc25519_mul.c b/ed25519/amd64-51-30k/sc25519_mul.c
index 92a12d0..94f74bf 100644
--- a/ed25519/amd64-51-30k/sc25519_mul.c
+++ b/ed25519/amd64-51-30k/sc25519_mul.c
@@ -1,6 +1,6 @@
 #include "sc25519.h"
 
-#define ull4_mul        crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul
+#define ull4_mul        CRYPTO_NAMESPACE(batch_ull4_mul)
 
 extern void ull4_mul(unsigned long long r[8], const unsigned long long x[4], const unsigned long long y[4]);
 
diff --git a/ed25519/amd64-64-24k/sc25519_sub_nored.s b/ed25519/amd64-51-30k/sc25519_sub_nored.S
similarity index 90%
rename from ed25519/amd64-64-24k/sc25519_sub_nored.s
rename to ed25519/amd64-51-30k/sc25519_sub_nored.S
index a347e7d..ea90130 100644
--- a/ed25519/amd64-64-24k/sc25519_sub_nored.s
+++ b/ed25519/amd64-51-30k/sc25519_sub_nored.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_sub_nored
+# qhasm: enter CRYPTO_NAMESPACE(batch_sc25519_sub_nored)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-.globl crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-_crypto_sign_ed25519_amd64_64_sc25519_sub_nored:
-crypto_sign_ed25519_amd64_64_sc25519_sub_nored:
+.globl _CRYPTO_NAMESPACE(batch_sc25519_sub_nored)
+.globl CRYPTO_NAMESPACE(batch_sc25519_sub_nored)
+_CRYPTO_NAMESPACE(batch_sc25519_sub_nored):
+CRYPTO_NAMESPACE(batch_sc25519_sub_nored):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-64-24k/ull4_mul.s b/ed25519/amd64-51-30k/ull4_mul.S
similarity index 98%
rename from ed25519/amd64-64-24k/ull4_mul.s
rename to ed25519/amd64-51-30k/ull4_mul.S
index 9f7b4fa..9f26ac9 100644
--- a/ed25519/amd64-64-24k/ull4_mul.s
+++ b/ed25519/amd64-51-30k/ull4_mul.S
@@ -77,13 +77,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ull4_mul 
+# qhasm: enter CRYPTO_NAMESPACE(batch_ull4_mul) 
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ull4_mul
-.globl crypto_sign_ed25519_amd64_64_ull4_mul
-_crypto_sign_ed25519_amd64_64_ull4_mul:
-crypto_sign_ed25519_amd64_64_ull4_mul:
+.globl _CRYPTO_NAMESPACE(batch_ull4_mul)
+.globl CRYPTO_NAMESPACE(batch_ull4_mul)
+_CRYPTO_NAMESPACE(batch_ull4_mul):
+CRYPTO_NAMESPACE(batch_ull4_mul):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/choose_t.s b/ed25519/amd64-64-24k/choose_t.S
similarity index 99%
rename from ed25519/amd64-64-24k/choose_t.s
rename to ed25519/amd64-64-24k/choose_t.S
index f10d8b8..095a431 100644
--- a/ed25519/amd64-64-24k/choose_t.s
+++ b/ed25519/amd64-64-24k/choose_t.S
@@ -101,13 +101,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_choose_t
+# qhasm: enter CRYPTO_NAMESPACE(choose_t)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_choose_t
-.globl crypto_sign_ed25519_amd64_64_choose_t
-_crypto_sign_ed25519_amd64_64_choose_t:
-crypto_sign_ed25519_amd64_64_choose_t:
+.globl _CRYPTO_NAMESPACE(choose_t)
+.globl CRYPTO_NAMESPACE(choose_t)
+_CRYPTO_NAMESPACE(choose_t):
+CRYPTO_NAMESPACE(choose_t):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/consts.S b/ed25519/amd64-64-24k/consts.S
new file mode 100644
index 0000000..ca9896f
--- /dev/null
+++ b/ed25519/amd64-64-24k/consts.S
@@ -0,0 +1,39 @@
+.section .rodata
+
+.globl CRYPTO_NAMESPACE(121666)
+.globl CRYPTO_NAMESPACE(MU0)
+.globl CRYPTO_NAMESPACE(MU1)
+.globl CRYPTO_NAMESPACE(MU2)
+.globl CRYPTO_NAMESPACE(MU3)
+.globl CRYPTO_NAMESPACE(MU4)
+.globl CRYPTO_NAMESPACE(ORDER0)
+.globl CRYPTO_NAMESPACE(ORDER1)
+.globl CRYPTO_NAMESPACE(ORDER2)
+.globl CRYPTO_NAMESPACE(ORDER3)
+.globl CRYPTO_NAMESPACE(EC2D0)
+.globl CRYPTO_NAMESPACE(EC2D1)
+.globl CRYPTO_NAMESPACE(EC2D2)
+.globl CRYPTO_NAMESPACE(EC2D3)
+.globl CRYPTO_NAMESPACE(38)
+
+.p2align 4
+
+CRYPTO_NAMESPACE(121666):     .quad 121666
+
+CRYPTO_NAMESPACE(MU0):         .quad 0xED9CE5A30A2C131B
+CRYPTO_NAMESPACE(MU1):         .quad 0x2106215D086329A7
+CRYPTO_NAMESPACE(MU2):         .quad 0xFFFFFFFFFFFFFFEB
+CRYPTO_NAMESPACE(MU3):         .quad 0xFFFFFFFFFFFFFFFF
+CRYPTO_NAMESPACE(MU4):         .quad 0x000000000000000F
+
+CRYPTO_NAMESPACE(ORDER0):      .quad 0x5812631A5CF5D3ED
+CRYPTO_NAMESPACE(ORDER1):      .quad 0x14DEF9DEA2F79CD6
+CRYPTO_NAMESPACE(ORDER2):      .quad 0x0000000000000000
+CRYPTO_NAMESPACE(ORDER3):      .quad 0x1000000000000000
+
+CRYPTO_NAMESPACE(EC2D0):       .quad 0xEBD69B9426B2F146
+CRYPTO_NAMESPACE(EC2D1):       .quad 0x00E0149A8283B156
+CRYPTO_NAMESPACE(EC2D2):       .quad 0x198E80F2EEF3D130
+CRYPTO_NAMESPACE(EC2D3):       .quad 0xA406D9DC56DFFCE7
+
+CRYPTO_NAMESPACE(38):         .quad 38
diff --git a/ed25519/amd64-64-24k/consts.s b/ed25519/amd64-64-24k/consts.s
deleted file mode 100644
index c272383..0000000
--- a/ed25519/amd64-64-24k/consts.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.data
-
-.globl crypto_sign_ed25519_amd64_64_121666
-.globl crypto_sign_ed25519_amd64_64_MU0
-.globl crypto_sign_ed25519_amd64_64_MU1
-.globl crypto_sign_ed25519_amd64_64_MU2
-.globl crypto_sign_ed25519_amd64_64_MU3
-.globl crypto_sign_ed25519_amd64_64_MU4
-.globl crypto_sign_ed25519_amd64_64_ORDER0
-.globl crypto_sign_ed25519_amd64_64_ORDER1
-.globl crypto_sign_ed25519_amd64_64_ORDER2
-.globl crypto_sign_ed25519_amd64_64_ORDER3
-.globl crypto_sign_ed25519_amd64_64_EC2D0
-.globl crypto_sign_ed25519_amd64_64_EC2D1
-.globl crypto_sign_ed25519_amd64_64_EC2D2
-.globl crypto_sign_ed25519_amd64_64_EC2D3
-.globl crypto_sign_ed25519_amd64_64_38
-
-.p2align 4
-
-crypto_sign_ed25519_amd64_64_121666:     .quad 121666
-
-crypto_sign_ed25519_amd64_64_MU0:         .quad 0xED9CE5A30A2C131B
-crypto_sign_ed25519_amd64_64_MU1:         .quad 0x2106215D086329A7
-crypto_sign_ed25519_amd64_64_MU2:         .quad 0xFFFFFFFFFFFFFFEB
-crypto_sign_ed25519_amd64_64_MU3:         .quad 0xFFFFFFFFFFFFFFFF
-crypto_sign_ed25519_amd64_64_MU4:         .quad 0x000000000000000F
-
-crypto_sign_ed25519_amd64_64_ORDER0:      .quad 0x5812631A5CF5D3ED
-crypto_sign_ed25519_amd64_64_ORDER1:      .quad 0x14DEF9DEA2F79CD6
-crypto_sign_ed25519_amd64_64_ORDER2:      .quad 0x0000000000000000
-crypto_sign_ed25519_amd64_64_ORDER3:      .quad 0x1000000000000000
-
-crypto_sign_ed25519_amd64_64_EC2D0:       .quad 0xEBD69B9426B2F146
-crypto_sign_ed25519_amd64_64_EC2D1:       .quad 0x00E0149A8283B156
-crypto_sign_ed25519_amd64_64_EC2D2:       .quad 0x198E80F2EEF3D130
-crypto_sign_ed25519_amd64_64_EC2D3:       .quad 0xA406D9DC56DFFCE7
-
-crypto_sign_ed25519_amd64_64_38:         .quad 38
diff --git a/ed25519/amd64-64-24k/crypto_sign.h b/ed25519/amd64-64-24k/crypto_sign.h
index ec6efa1..35b0a74 100644
--- a/ed25519/amd64-64-24k/crypto_sign.h
+++ b/ed25519/amd64-64-24k/crypto_sign.h
@@ -1,9 +1,9 @@
-#define crypto_sign ed25519_amd64_64_sign
-#define crypto_sign_keypair ed25519_amd64_64_keygen
-#define crypto_sign_seckey ed25519_amd64_64_seckey
-#define crypto_sign_seckey_expand ed25519_amd64_64_seckey_expand
-#define crypto_sign_pubkey ed25519_amd64_64_pubkey
-#define crypto_sign_open ed25519_amd64_64_open
-#define crypto_sign_open_batch ed25519_amd64_64_open_batch
+#define crypto_sign               CRYPTO_NAMESPACE(sign)
+#define crypto_sign_keypair       CRYPTO_NAMESPACE(keygen)
+#define crypto_sign_seckey        CRYPTO_NAMESPACE(seckey)
+#define crypto_sign_seckey_expand CRYPTO_NAMESPACE(seckey_expand)
+#define crypto_sign_pubkey        CRYPTO_NAMESPACE(pubkey)
+#define crypto_sign_open          CRYPTO_NAMESPACE(open)
+#define crypto_sign_open_batch    CRYPTO_NAMESPACE(open_batch)
 
 #include "ed25519.h"
diff --git a/ed25519/amd64-64-24k/fe25519.h b/ed25519/amd64-64-24k/fe25519.h
index 780d96d..afade2d 100644
--- a/ed25519/amd64-64-24k/fe25519.h
+++ b/ed25519/amd64-64-24k/fe25519.h
@@ -3,24 +3,24 @@
 
 #include <stddef.h>
 
-#define fe25519                crypto_sign_ed25519_amd64_64_fe25519
-#define fe25519_freeze         crypto_sign_ed25519_amd64_64_fe25519_freeze
-#define fe25519_unpack         crypto_sign_ed25519_amd64_64_fe25519_unpack
-#define fe25519_pack           crypto_sign_ed25519_amd64_64_fe25519_pack
-#define fe25519_iszero_vartime crypto_sign_ed25519_amd64_64_fe25519_iszero_vartime
-#define fe25519_iseq_vartime   crypto_sign_ed25519_amd64_64_fe25519_iseq_vartime
-#define fe25519_cmov           crypto_sign_ed25519_amd64_64_fe25519_cmov
-#define fe25519_setint         crypto_sign_ed25519_amd64_64_fe25519_setint
-#define fe25519_neg            crypto_sign_ed25519_amd64_64_fe25519_neg
-#define fe25519_getparity      crypto_sign_ed25519_amd64_64_fe25519_getparity
-#define fe25519_add            crypto_sign_ed25519_amd64_64_fe25519_add
-#define fe25519_sub            crypto_sign_ed25519_amd64_64_fe25519_sub
-#define fe25519_mul            crypto_sign_ed25519_amd64_64_fe25519_mul
-#define fe25519_mul121666      crypto_sign_ed25519_amd64_64_fe25519_mul121666
-#define fe25519_square         crypto_sign_ed25519_amd64_64_fe25519_square
-#define fe25519_invert         crypto_sign_ed25519_amd64_64_fe25519_invert
-#define fe25519_batchinvert    crypto_sign_ed25519_amd64_64_fe25519_batchinvert
-#define fe25519_pow2523        crypto_sign_ed25519_amd64_64_fe25519_pow2523
+#define fe25519                CRYPTO_NAMESPACE(fe25519)
+#define fe25519_freeze         CRYPTO_NAMESPACE(fe25519_freeze)
+#define fe25519_unpack         CRYPTO_NAMESPACE(fe25519_unpack)
+#define fe25519_pack           CRYPTO_NAMESPACE(fe25519_pack)
+#define fe25519_iszero_vartime CRYPTO_NAMESPACE(fe25519_iszero_vartime)
+#define fe25519_iseq_vartime   CRYPTO_NAMESPACE(fe25519_iseq_vartime)
+#define fe25519_cmov           CRYPTO_NAMESPACE(fe25519_cmov)
+#define fe25519_setint         CRYPTO_NAMESPACE(fe25519_setint)
+#define fe25519_neg            CRYPTO_NAMESPACE(fe25519_neg)
+#define fe25519_getparity      CRYPTO_NAMESPACE(fe25519_getparity)
+#define fe25519_add            CRYPTO_NAMESPACE(fe25519_add)
+#define fe25519_sub            CRYPTO_NAMESPACE(fe25519_sub)
+#define fe25519_mul            CRYPTO_NAMESPACE(fe25519_mul)
+#define fe25519_mul121666      CRYPTO_NAMESPACE(fe25519_mul121666)
+#define fe25519_square         CRYPTO_NAMESPACE(fe25519_square)
+#define fe25519_invert         CRYPTO_NAMESPACE(fe25519_invert)
+#define fe25519_batchinvert    CRYPTO_NAMESPACE(fe25519_batchinvert)
+#define fe25519_pow2523        CRYPTO_NAMESPACE(fe25519_pow2523)
 
 typedef struct
 {
diff --git a/ed25519/amd64-64-24k/fe25519_add.s b/ed25519/amd64-64-24k/fe25519_add.S
similarity index 94%
rename from ed25519/amd64-64-24k/fe25519_add.s
rename to ed25519/amd64-64-24k/fe25519_add.S
index b2e5625..de57080 100644
--- a/ed25519/amd64-64-24k/fe25519_add.s
+++ b/ed25519/amd64-64-24k/fe25519_add.S
@@ -65,13 +65,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_add
+# qhasm: enter CRYPTO_NAMESPACE(fe25519_add)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_add
-.globl crypto_sign_ed25519_amd64_64_fe25519_add
-_crypto_sign_ed25519_amd64_64_fe25519_add:
-crypto_sign_ed25519_amd64_64_fe25519_add:
+.globl _CRYPTO_NAMESPACE(fe25519_add)
+.globl CRYPTO_NAMESPACE(fe25519_add)
+_CRYPTO_NAMESPACE(fe25519_add):
+CRYPTO_NAMESPACE(fe25519_add):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-64-24k/fe25519_freeze.s b/ed25519/amd64-64-24k/fe25519_freeze.S
similarity index 96%
rename from ed25519/amd64-64-24k/fe25519_freeze.s
rename to ed25519/amd64-64-24k/fe25519_freeze.S
index dea2902..f0f15be 100644
--- a/ed25519/amd64-64-24k/fe25519_freeze.s
+++ b/ed25519/amd64-64-24k/fe25519_freeze.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_freeze
+# qhasm: enter CRYPTO_NAMESPACE(fe25519_freeze)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_freeze
-.globl crypto_sign_ed25519_amd64_64_fe25519_freeze
-_crypto_sign_ed25519_amd64_64_fe25519_freeze:
-crypto_sign_ed25519_amd64_64_fe25519_freeze:
+.globl _CRYPTO_NAMESPACE(fe25519_freeze)
+.globl CRYPTO_NAMESPACE(fe25519_freeze)
+_CRYPTO_NAMESPACE(fe25519_freeze):
+CRYPTO_NAMESPACE(fe25519_freeze):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/fe25519_mul.s b/ed25519/amd64-64-24k/fe25519_mul.S
similarity index 96%
rename from ed25519/amd64-64-24k/fe25519_mul.s
rename to ed25519/amd64-64-24k/fe25519_mul.S
index 7e24518..5c67c9f 100644
--- a/ed25519/amd64-64-24k/fe25519_mul.s
+++ b/ed25519/amd64-64-24k/fe25519_mul.S
@@ -89,13 +89,13 @@
 
 # qhasm: int64 muli38
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_mul
+# qhasm: enter CRYPTO_NAMESPACE(fe25519_mul)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_mul
-.globl crypto_sign_ed25519_amd64_64_fe25519_mul
-_crypto_sign_ed25519_amd64_64_fe25519_mul:
-crypto_sign_ed25519_amd64_64_fe25519_mul:
+.globl _CRYPTO_NAMESPACE(fe25519_mul)
+.globl CRYPTO_NAMESPACE(fe25519_mul)
+_CRYPTO_NAMESPACE(fe25519_mul):
+CRYPTO_NAMESPACE(fe25519_mul):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -651,8 +651,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -669,8 +669,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -692,8 +692,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -715,8 +715,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/fe25519_square.s b/ed25519/amd64-64-24k/fe25519_square.S
similarity index 96%
rename from ed25519/amd64-64-24k/fe25519_square.s
rename to ed25519/amd64-64-24k/fe25519_square.S
index 3f51fd1..7688f62 100644
--- a/ed25519/amd64-64-24k/fe25519_square.s
+++ b/ed25519/amd64-64-24k/fe25519_square.S
@@ -83,13 +83,13 @@
 
 # qhasm: int64 squarei38
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_square
+# qhasm: enter CRYPTO_NAMESPACE(fe25519_square)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_square
-.globl crypto_sign_ed25519_amd64_64_fe25519_square
-_crypto_sign_ed25519_amd64_64_fe25519_square:
-crypto_sign_ed25519_amd64_64_fe25519_square:
+.globl _CRYPTO_NAMESPACE(fe25519_square)
+.globl CRYPTO_NAMESPACE(fe25519_square)
+_CRYPTO_NAMESPACE(fe25519_square):
+CRYPTO_NAMESPACE(fe25519_square):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -425,8 +425,8 @@ adc %rdx,%rcx
 # asm 2: mov  <squarer4=%r11,>squarerax=%rax
 mov  %r11,%rax
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   squarer4 = squarerax
 # asm 1: mov  <squarerax=int64#7,>squarer4=int64#2
@@ -443,8 +443,8 @@ mov  %r12,%rax
 # asm 2: mov  <squarerdx=%rdx,>squarer5=%r11
 mov  %rdx,%r11
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer5 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer5=int64#9
@@ -466,8 +466,8 @@ mov  $0,%r12
 # asm 2: adc <squarerdx=%rdx,<squarer6=%r12
 adc %rdx,%r12
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer6 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer6=int64#10
@@ -489,8 +489,8 @@ mov  $0,%rcx
 # asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
 adc %rdx,%rcx
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer7 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer7=int64#4
diff --git a/ed25519/amd64-64-24k/fe25519_sub.s b/ed25519/amd64-64-24k/fe25519_sub.S
similarity index 94%
rename from ed25519/amd64-64-24k/fe25519_sub.s
rename to ed25519/amd64-64-24k/fe25519_sub.S
index 0b395bc..9093718 100644
--- a/ed25519/amd64-64-24k/fe25519_sub.s
+++ b/ed25519/amd64-64-24k/fe25519_sub.S
@@ -65,13 +65,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_sub
+# qhasm: enter CRYPTO_NAMESPACE(fe25519_sub)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_sub
-.globl crypto_sign_ed25519_amd64_64_fe25519_sub
-_crypto_sign_ed25519_amd64_64_fe25519_sub:
-crypto_sign_ed25519_amd64_64_fe25519_sub:
+.globl _CRYPTO_NAMESPACE(fe25519_sub)
+.globl CRYPTO_NAMESPACE(fe25519_sub)
+_CRYPTO_NAMESPACE(fe25519_sub):
+CRYPTO_NAMESPACE(fe25519_sub):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-64-24k/ge25519.h b/ed25519/amd64-64-24k/ge25519.h
index 46c0d7d..ab0c6ed 100644
--- a/ed25519/amd64-64-24k/ge25519.h
+++ b/ed25519/amd64-64-24k/ge25519.h
@@ -4,24 +4,24 @@
 #include "fe25519.h"
 #include "sc25519.h"
 
-#define ge25519                           crypto_sign_ed25519_amd64_64_ge25519
-#define ge25519_base                      crypto_sign_ed25519_amd64_64_ge25519_base
-#define ge25519_unpackneg_vartime         crypto_sign_ed25519_amd64_64_unpackneg_vartime
-#define ge25519_pack                      crypto_sign_ed25519_amd64_64_pack
-#define ge25519_isneutral_vartime         crypto_sign_ed25519_amd64_64_isneutral_vartime
-#define ge25519_add                       crypto_sign_ed25519_amd64_64_ge25519_add
-#define ge25519_double                    crypto_sign_ed25519_amd64_64_ge25519_double
-#define ge25519_double_scalarmult_vartime crypto_sign_ed25519_amd64_64_double_scalarmult_vartime
-#define ge25519_multi_scalarmult_vartime  crypto_sign_ed25519_amd64_64_ge25519_multi_scalarmult_vartime
-#define ge25519_scalarmult_base           crypto_sign_ed25519_amd64_64_scalarmult_base
-#define ge25519_p1p1_to_p2                crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-#define ge25519_p1p1_to_p3                crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-#define ge25519_add_p1p1                  crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-#define ge25519_dbl_p1p1                  crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-#define choose_t                          crypto_sign_ed25519_amd64_64_choose_t
-#define ge25519_nielsadd2                 crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-#define ge25519_nielsadd_p1p1             crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-#define ge25519_pnielsadd_p1p1            crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
+#define ge25519                           CRYPTO_NAMESPACE(ge25519)
+#define ge25519_base                      CRYPTO_NAMESPACE(ge25519_base)
+#define ge25519_unpackneg_vartime         CRYPTO_NAMESPACE(unpackneg_vartime)
+#define ge25519_pack                      CRYPTO_NAMESPACE(pack)
+#define ge25519_isneutral_vartime         CRYPTO_NAMESPACE(isneutral_vartime)
+#define ge25519_add                       CRYPTO_NAMESPACE(ge25519_add)
+#define ge25519_double                    CRYPTO_NAMESPACE(ge25519_double)
+#define ge25519_double_scalarmult_vartime CRYPTO_NAMESPACE(double_scalarmult_vartime)
+#define ge25519_multi_scalarmult_vartime  CRYPTO_NAMESPACE(ge25519_multi_scalarmult_vartime)
+#define ge25519_scalarmult_base           CRYPTO_NAMESPACE(scalarmult_base)
+#define ge25519_p1p1_to_p2                CRYPTO_NAMESPACE(ge25519_p1p1_to_p2)
+#define ge25519_p1p1_to_p3                CRYPTO_NAMESPACE(ge25519_p1p1_to_p3)
+#define ge25519_add_p1p1                  CRYPTO_NAMESPACE(ge25519_add_p1p1)
+#define ge25519_dbl_p1p1                  CRYPTO_NAMESPACE(ge25519_dbl_p1p1)
+#define choose_t                          CRYPTO_NAMESPACE(choose_t)
+#define ge25519_nielsadd2                 CRYPTO_NAMESPACE(ge25519_nielsadd2)
+#define ge25519_nielsadd_p1p1             CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1)
+#define ge25519_pnielsadd_p1p1            CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1)
 
 
 #define ge25519_p3 ge25519
diff --git a/ed25519/amd64-64-24k/ge25519_add_p1p1.s b/ed25519/amd64-64-24k/ge25519_add_p1p1.S
similarity index 94%
rename from ed25519/amd64-64-24k/ge25519_add_p1p1.s
rename to ed25519/amd64-64-24k/ge25519_add_p1p1.S
index 9557e07..eb4abf7 100644
--- a/ed25519/amd64-64-24k/ge25519_add_p1p1.s
+++ b/ed25519/amd64-64-24k/ge25519_add_p1p1.S
@@ -225,13 +225,13 @@
 
 # qhasm: int64 subt1
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_add_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_add_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_add_p1p1:
+.globl _CRYPTO_NAMESPACE(ge25519_add_p1p1)
+.globl CRYPTO_NAMESPACE(ge25519_add_p1p1)
+_CRYPTO_NAMESPACE(ge25519_add_p1p1):
+CRYPTO_NAMESPACE(ge25519_add_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $192,%r11
@@ -1207,8 +1207,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1225,8 +1225,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1248,8 +1248,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1271,8 +1271,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -1889,8 +1889,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1907,8 +1907,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1930,8 +1930,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1953,8 +1953,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -2741,8 +2741,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -2759,8 +2759,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -2782,8 +2782,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -2805,8 +2805,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -2938,10 +2938,10 @@ mov  $0,%r11
 # asm 2: movq <c0_stack=56(%rsp),>mulx0=%r12
 movq 56(%rsp),%r12
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D0)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D0)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
 # asm 1: mul  <mulx0=int64#10
@@ -2958,10 +2958,10 @@ mov  %rax,%r13
 # asm 2: mov  <mulrdx=%rdx,>c1=%r14
 mov  %rdx,%r14
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D1)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D1)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
 # asm 1: mul  <mulx0=int64#10
@@ -2983,10 +2983,10 @@ mov  $0,%r15
 # asm 2: adc <mulrdx=%rdx,<c2=%r15
 adc %rdx,%r15
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D2)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D2)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
 # asm 1: mul  <mulx0=int64#10
@@ -3008,10 +3008,10 @@ mov  $0,%rbx
 # asm 2: adc <mulrdx=%rdx,<c3=%rbx
 adc %rdx,%rbx
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D3)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D3)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
 # asm 1: mul  <mulx0=int64#10
@@ -3033,10 +3033,10 @@ adc %rdx,%r8
 # asm 2: movq <c1_stack=64(%rsp),>mulx1=%r12
 movq 64(%rsp),%r12
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D0)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D0)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
 # asm 1: mul  <mulx1=int64#10
@@ -3058,10 +3058,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D1)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D1)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
 # asm 1: mul  <mulx1=int64#10
@@ -3093,10 +3093,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D2)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D2)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
 # asm 1: mul  <mulx1=int64#10
@@ -3128,10 +3128,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D3)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D3)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
 # asm 1: mul  <mulx1=int64#10
@@ -3163,10 +3163,10 @@ adc %rdx,%r9
 # asm 2: movq <c2_stack=72(%rsp),>mulx2=%r12
 movq 72(%rsp),%r12
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D0)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D0)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
 # asm 1: mul  <mulx2=int64#10
@@ -3188,10 +3188,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D1)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D1)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
 # asm 1: mul  <mulx2=int64#10
@@ -3223,10 +3223,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D2)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D2)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
 # asm 1: mul  <mulx2=int64#10
@@ -3258,10 +3258,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D3)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D3)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
 # asm 1: mul  <mulx2=int64#10
@@ -3293,10 +3293,10 @@ adc %rdx,%r10
 # asm 2: movq <c3_stack=80(%rsp),>mulx3=%r12
 movq 80(%rsp),%r12
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D0)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D0),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D0)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
 # asm 1: mul  <mulx3=int64#10
@@ -3318,10 +3318,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D1)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D1),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D1)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
 # asm 1: mul  <mulx3=int64#10
@@ -3353,10 +3353,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D2)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D2),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D2)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
 # asm 1: mul  <mulx3=int64#10
@@ -3388,10 +3388,10 @@ mov  $0,%rbp
 # asm 2: adc <mulrdx=%rdx,<mulc=%rbp
 adc %rdx,%rbp
 
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3,%rax
+# qhasm:   mulrax = *(uint64 *)&CRYPTO_NAMESPACE(EC2D3)
+# asm 1: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=int64#7
+# asm 2: movq CRYPTO_NAMESPACE(EC2D3),>mulrax=%rax
+movq CRYPTO_NAMESPACE(EC2D3)(%rip),%rax
 
 # qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
 # asm 1: mul  <mulx3=int64#10
@@ -3423,8 +3423,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -3441,8 +3441,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -3464,8 +3464,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -3487,8 +3487,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -4105,8 +4105,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -4123,8 +4123,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -4146,8 +4146,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -4169,8 +4169,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/ge25519_dbl_p1p1.s b/ed25519/amd64-64-24k/ge25519_dbl_p1p1.S
similarity index 98%
rename from ed25519/amd64-64-24k/ge25519_dbl_p1p1.s
rename to ed25519/amd64-64-24k/ge25519_dbl_p1p1.S
index 7909a98..f6b7d22 100644
--- a/ed25519/amd64-64-24k/ge25519_dbl_p1p1.s
+++ b/ed25519/amd64-64-24k/ge25519_dbl_p1p1.S
@@ -233,13 +233,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_dbl_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1:
+.globl _CRYPTO_NAMESPACE(ge25519_dbl_p1p1)
+.globl CRYPTO_NAMESPACE(ge25519_dbl_p1p1)
+_CRYPTO_NAMESPACE(ge25519_dbl_p1p1):
+CRYPTO_NAMESPACE(ge25519_dbl_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $192,%r11
@@ -575,8 +575,8 @@ adc %rdx,%rcx
 # asm 2: mov  <squarer4=%r11,>squarerax=%rax
 mov  %r11,%rax
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   squarer4 = squarerax
 # asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
@@ -593,8 +593,8 @@ mov  %r12,%rax
 # asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
 mov  %rdx,%r12
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer5 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer5=int64#10
@@ -616,8 +616,8 @@ mov  $0,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer6=%r13
 adc %rdx,%r13
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer6 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer6=int64#11
@@ -639,8 +639,8 @@ mov  $0,%rcx
 # asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
 adc %rdx,%rcx
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer7 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer7=int64#4
@@ -1042,8 +1042,8 @@ adc %rdx,%rcx
 # asm 2: mov  <squarer4=%r11,>squarerax=%rax
 mov  %r11,%rax
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   squarer4 = squarerax
 # asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
@@ -1060,8 +1060,8 @@ mov  %r12,%rax
 # asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
 mov  %rdx,%r12
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer5 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer5=int64#10
@@ -1083,8 +1083,8 @@ mov  $0,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer6=%r13
 adc %rdx,%r13
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer6 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer6=int64#11
@@ -1106,8 +1106,8 @@ mov  $0,%rcx
 # asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
 adc %rdx,%rcx
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer7 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer7=int64#4
@@ -1509,8 +1509,8 @@ adc %rdx,%rcx
 # asm 2: mov  <squarer4=%r11,>squarerax=%rax
 mov  %r11,%rax
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   squarer4 = squarerax
 # asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
@@ -1527,8 +1527,8 @@ mov  %r12,%rax
 # asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
 mov  %rdx,%r12
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer5 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer5=int64#10
@@ -1550,8 +1550,8 @@ mov  $0,%r13
 # asm 2: adc <squarerdx=%rdx,<squarer6=%r13
 adc %rdx,%r13
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer6 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer6=int64#11
@@ -1573,8 +1573,8 @@ mov  $0,%rcx
 # asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
 adc %rdx,%rcx
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer7 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer7=int64#4
@@ -2631,8 +2631,8 @@ adc %rdx,%rsi
 # asm 2: mov  <squarer4=%r10,>squarerax=%rax
 mov  %r10,%rax
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   squarer4 = squarerax
 # asm 1: mov  <squarerax=int64#7,>squarer4=int64#8
@@ -2649,8 +2649,8 @@ mov  %r11,%rax
 # asm 2: mov  <squarerdx=%rdx,>squarer5=%r11
 mov  %rdx,%r11
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer5 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer5=int64#9
@@ -2672,8 +2672,8 @@ mov  $0,%r12
 # asm 2: adc <squarerdx=%rdx,<squarer6=%r12
 adc %rdx,%r12
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer6 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer6=int64#10
@@ -2695,8 +2695,8 @@ mov  $0,%rsi
 # asm 2: adc <squarerdx=%rdx,<squarer7=%rsi
 adc %rdx,%rsi
 
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? squarer7 += squarerax
 # asm 1: add  <squarerax=int64#7,<squarer7=int64#2
diff --git a/ed25519/amd64-64-24k/ge25519_double_scalarmult.c b/ed25519/amd64-64-24k/ge25519_double_scalarmult.c
index 30c922a..e926b10 100644
--- a/ed25519/amd64-64-24k/ge25519_double_scalarmult.c
+++ b/ed25519/amd64-64-24k/ge25519_double_scalarmult.c
@@ -7,7 +7,7 @@
 #define S2_SWINDOWSIZE 7
 #define PRE2_SIZE (1<<(S2_SWINDOWSIZE-2))
 
-ge25519_niels pre2[PRE2_SIZE] = {
+static const ge25519_niels pre2[PRE2_SIZE] = {
 #include "ge25519_base_slide_multiples.data"
 };
 
diff --git a/ed25519/amd64-64-24k/ge25519_nielsadd2.s b/ed25519/amd64-64-24k/ge25519_nielsadd2.S
similarity index 97%
rename from ed25519/amd64-64-24k/ge25519_nielsadd2.s
rename to ed25519/amd64-64-24k/ge25519_nielsadd2.S
index ec31e02..d8f598c 100644
--- a/ed25519/amd64-64-24k/ge25519_nielsadd2.s
+++ b/ed25519/amd64-64-24k/ge25519_nielsadd2.S
@@ -293,13 +293,13 @@
 
 # qhasm: int64 subt1
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_nielsadd2)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-.globl crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-_crypto_sign_ed25519_amd64_64_ge25519_nielsadd2:
-crypto_sign_ed25519_amd64_64_ge25519_nielsadd2:
+.globl _CRYPTO_NAMESPACE(ge25519_nielsadd2)
+.globl CRYPTO_NAMESPACE(ge25519_nielsadd2)
+_CRYPTO_NAMESPACE(ge25519_nielsadd2):
+CRYPTO_NAMESPACE(ge25519_nielsadd2):
 mov %rsp,%r11
 and $31,%r11
 add $192,%r11
@@ -1060,8 +1060,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -1078,8 +1078,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -1101,8 +1101,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -1124,8 +1124,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -1742,8 +1742,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -1760,8 +1760,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -1783,8 +1783,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -1806,8 +1806,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -2594,8 +2594,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -2612,8 +2612,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -2635,8 +2635,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -2658,8 +2658,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
@@ -3531,8 +3531,8 @@ adc %rdx,%r9
 # asm 2: mov  <mulr4=%rsi,>mulrax=%rax
 mov  %rsi,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -3549,8 +3549,8 @@ mov  %rcx,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -3572,8 +3572,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -3595,8 +3595,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
@@ -4213,8 +4213,8 @@ adc %rdx,%r9
 # asm 2: mov  <mulr4=%rsi,>mulrax=%rax
 mov  %rsi,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -4231,8 +4231,8 @@ mov  %rcx,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -4254,8 +4254,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -4277,8 +4277,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
@@ -4895,8 +4895,8 @@ adc %rdx,%r9
 # asm 2: mov  <mulr4=%rsi,>mulrax=%rax
 mov  %rsi,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -4913,8 +4913,8 @@ mov  %rcx,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -4936,8 +4936,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -4959,8 +4959,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
@@ -5577,8 +5577,8 @@ adc %rdx,%r9
 # asm 2: mov  <mulr4=%rsi,>mulrax=%rax
 mov  %rsi,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -5595,8 +5595,8 @@ mov  %rcx,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -5618,8 +5618,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -5641,8 +5641,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.s b/ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.S
similarity index 97%
rename from ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.s
rename to ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.S
index 04e9b52..21020ea 100644
--- a/ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.s
+++ b/ed25519/amd64-64-24k/ge25519_nielsadd_p1p1.S
@@ -297,13 +297,13 @@
 
 # qhasm: int64 subt1
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1:
+.globl _CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1)
+.globl CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1)
+_CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1):
+CRYPTO_NAMESPACE(ge25519_nielsadd_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $128,%r11
@@ -1069,8 +1069,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1087,8 +1087,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1110,8 +1110,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1133,8 +1133,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -1751,8 +1751,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1769,8 +1769,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1792,8 +1792,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1815,8 +1815,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -2603,8 +2603,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -2621,8 +2621,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -2644,8 +2644,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -2667,8 +2667,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
diff --git a/ed25519/amd64-64-24k/ge25519_p1p1_to_p2.s b/ed25519/amd64-64-24k/ge25519_p1p1_to_p2.S
similarity index 96%
rename from ed25519/amd64-64-24k/ge25519_p1p1_to_p2.s
rename to ed25519/amd64-64-24k/ge25519_p1p1_to_p2.S
index c3a1bdd..c39c235 100644
--- a/ed25519/amd64-64-24k/ge25519_p1p1_to_p2.s
+++ b/ed25519/amd64-64-24k/ge25519_p1p1_to_p2.S
@@ -101,13 +101,13 @@
 
 # qhasm: int64 muli38
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_p1p1_to_p2)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-.globl crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-_crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2:
-crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2:
+.globl _CRYPTO_NAMESPACE(ge25519_p1p1_to_p2)
+.globl CRYPTO_NAMESPACE(ge25519_p1p1_to_p2)
+_CRYPTO_NAMESPACE(ge25519_p1p1_to_p2):
+CRYPTO_NAMESPACE(ge25519_p1p1_to_p2):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -658,8 +658,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -676,8 +676,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -699,8 +699,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -722,8 +722,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -1340,8 +1340,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -1358,8 +1358,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -1381,8 +1381,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -1404,8 +1404,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -2022,8 +2022,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -2040,8 +2040,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -2063,8 +2063,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -2086,8 +2086,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/ge25519_p1p1_to_p3.s b/ed25519/amd64-64-24k/ge25519_p1p1_to_p3.S
similarity index 96%
rename from ed25519/amd64-64-24k/ge25519_p1p1_to_p3.s
rename to ed25519/amd64-64-24k/ge25519_p1p1_to_p3.S
index 607b9ea..259873b 100644
--- a/ed25519/amd64-64-24k/ge25519_p1p1_to_p3.s
+++ b/ed25519/amd64-64-24k/ge25519_p1p1_to_p3.S
@@ -109,13 +109,13 @@
 
 # qhasm: int64 muli38
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_p1p1_to_p3)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-.globl crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-_crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3:
-crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3:
+.globl _CRYPTO_NAMESPACE(ge25519_p1p1_to_p3)
+.globl CRYPTO_NAMESPACE(ge25519_p1p1_to_p3)
+_CRYPTO_NAMESPACE(ge25519_p1p1_to_p3):
+CRYPTO_NAMESPACE(ge25519_p1p1_to_p3):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
@@ -666,8 +666,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -684,8 +684,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -707,8 +707,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -730,8 +730,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -1348,8 +1348,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -1366,8 +1366,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -1389,8 +1389,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -1412,8 +1412,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -2030,8 +2030,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
@@ -2048,8 +2048,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
 mov  %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#5
@@ -2071,8 +2071,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#6
@@ -2094,8 +2094,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#8
@@ -2712,8 +2712,8 @@ adc %rdx,%r10
 # asm 2: mov  <mulr4=%rcx,>mulrax=%rax
 mov  %rcx,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -2730,8 +2730,8 @@ mov  %r8,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -2753,8 +2753,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -2776,8 +2776,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.s b/ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.S
similarity index 97%
rename from ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.s
rename to ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.S
index 93b7cc5..ad27aca 100644
--- a/ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.s
+++ b/ed25519/amd64-64-24k/ge25519_pnielsadd_p1p1.S
@@ -225,13 +225,13 @@
 
 # qhasm: int64 subt1
 
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
+# qhasm: enter CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1:
+.globl _CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1)
+.globl CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1)
+_CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1):
+CRYPTO_NAMESPACE(ge25519_pnielsadd_p1p1):
 mov %rsp,%r11
 and $31,%r11
 add $128,%r11
@@ -997,8 +997,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1015,8 +1015,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1038,8 +1038,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1061,8 +1061,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -1679,8 +1679,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -1697,8 +1697,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -1720,8 +1720,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -1743,8 +1743,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -2531,8 +2531,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
@@ -2549,8 +2549,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
 mov  %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#6
@@ -2572,8 +2572,8 @@ mov  $0,%r10
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r10
 adc %rdx,%r10
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#8
@@ -2595,8 +2595,8 @@ mov  $0,%r11
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r11
 adc %rdx,%r11
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#9
@@ -3213,8 +3213,8 @@ adc %rdx,%r11
 # asm 2: mov  <mulr4=%r8,>mulrax=%rax
 mov  %r8,%rax
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   mulr4 = mulrax
 # asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
@@ -3231,8 +3231,8 @@ mov  %r9,%rax
 # asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
 mov  %rdx,%rcx
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr5 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr5=int64#4
@@ -3254,8 +3254,8 @@ mov  $0,%r8
 # asm 2: adc <mulrdx=%rdx,<mulr6=%r8
 adc %rdx,%r8
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr6 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr6=int64#5
@@ -3277,8 +3277,8 @@ mov  $0,%r9
 # asm 2: adc <mulrdx=%rdx,<mulr7=%r9
 adc %rdx,%r9
 
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38
+# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&CRYPTO_NAMESPACE(38)
+mulq CRYPTO_NAMESPACE(38)(%rip)
 
 # qhasm:   carry? mulr7 += mulrax
 # asm 1: add  <mulrax=int64#7,<mulr7=int64#6
diff --git a/ed25519/amd64-64-24k/ge25519_scalarmult_base.c b/ed25519/amd64-64-24k/ge25519_scalarmult_base.c
index 34709e1..986abaf 100644
--- a/ed25519/amd64-64-24k/ge25519_scalarmult_base.c
+++ b/ed25519/amd64-64-24k/ge25519_scalarmult_base.c
@@ -11,10 +11,8 @@ static const ge25519_niels ge25519_base_multiples_niels[] = {
 #endif
 };
 
-#ifdef SMALLTABLES
 /* d */
 static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};
-#endif
 
 void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
 {
diff --git a/ed25519/amd64-51-30k/heap_rootreplaced.s b/ed25519/amd64-64-24k/heap_rootreplaced.S
similarity index 97%
rename from ed25519/amd64-51-30k/heap_rootreplaced.s
rename to ed25519/amd64-64-24k/heap_rootreplaced.S
index bad2b76..5016051 100644
--- a/ed25519/amd64-51-30k/heap_rootreplaced.s
+++ b/ed25519/amd64-64-24k/heap_rootreplaced.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced
+# qhasm: enter CRYPTO_NAMESPACE(heap_rootreplaced)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced
-.globl crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced
-_crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced:
-crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced:
+.globl _CRYPTO_NAMESPACE(heap_rootreplaced)
+.globl CRYPTO_NAMESPACE(heap_rootreplaced)
+_CRYPTO_NAMESPACE(heap_rootreplaced):
+CRYPTO_NAMESPACE(heap_rootreplaced):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-51-30k/heap_rootreplaced_1limb.s b/ed25519/amd64-64-24k/heap_rootreplaced_1limb.S
similarity index 96%
rename from ed25519/amd64-51-30k/heap_rootreplaced_1limb.s
rename to ed25519/amd64-64-24k/heap_rootreplaced_1limb.S
index b0b6204..bcd569a 100644
--- a/ed25519/amd64-51-30k/heap_rootreplaced_1limb.s
+++ b/ed25519/amd64-64-24k/heap_rootreplaced_1limb.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb
+# qhasm: enter CRYPTO_NAMESPACE(heap_rootreplaced_1limb)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb
-.globl crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb
-_crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb:
-crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_1limb:
+.globl _CRYPTO_NAMESPACE(heap_rootreplaced_1limb)
+.globl CRYPTO_NAMESPACE(heap_rootreplaced_1limb)
+_CRYPTO_NAMESPACE(heap_rootreplaced_1limb):
+CRYPTO_NAMESPACE(heap_rootreplaced_1limb):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-51-30k/heap_rootreplaced_2limbs.s b/ed25519/amd64-64-24k/heap_rootreplaced_2limbs.S
similarity index 96%
rename from ed25519/amd64-51-30k/heap_rootreplaced_2limbs.s
rename to ed25519/amd64-64-24k/heap_rootreplaced_2limbs.S
index 750f8f6..93e6264 100644
--- a/ed25519/amd64-51-30k/heap_rootreplaced_2limbs.s
+++ b/ed25519/amd64-64-24k/heap_rootreplaced_2limbs.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs
+# qhasm: enter CRYPTO_NAMESPACE(heap_rootreplaced_2limbs)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs
-.globl crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs
-_crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs:
-crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_2limbs:
+.globl _CRYPTO_NAMESPACE(heap_rootreplaced_2limbs)
+.globl CRYPTO_NAMESPACE(heap_rootreplaced_2limbs)
+_CRYPTO_NAMESPACE(heap_rootreplaced_2limbs):
+CRYPTO_NAMESPACE(heap_rootreplaced_2limbs):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-51-30k/heap_rootreplaced_3limbs.s b/ed25519/amd64-64-24k/heap_rootreplaced_3limbs.S
similarity index 96%
rename from ed25519/amd64-51-30k/heap_rootreplaced_3limbs.s
rename to ed25519/amd64-64-24k/heap_rootreplaced_3limbs.S
index e5aeda9..5b6f509 100644
--- a/ed25519/amd64-51-30k/heap_rootreplaced_3limbs.s
+++ b/ed25519/amd64-64-24k/heap_rootreplaced_3limbs.S
@@ -93,13 +93,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs
+# qhasm: enter CRYPTO_NAMESPACE(heap_rootreplaced_3limbs)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs
-.globl crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs
-_crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs:
-crypto_sign_ed25519_amd64_51_30k_batch_heap_rootreplaced_3limbs:
+.globl _CRYPTO_NAMESPACE(heap_rootreplaced_3limbs)
+.globl CRYPTO_NAMESPACE(heap_rootreplaced_3limbs)
+_CRYPTO_NAMESPACE(heap_rootreplaced_3limbs):
+CRYPTO_NAMESPACE(heap_rootreplaced_3limbs):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/amd64-64-24k/hram.h b/ed25519/amd64-64-24k/hram.h
index 1740c78..c2a151f 100644
--- a/ed25519/amd64-64-24k/hram.h
+++ b/ed25519/amd64-64-24k/hram.h
@@ -1,7 +1,7 @@
 #ifndef HRAM_H
 #define HRAM_H
 
-#define get_hram crypto_sign_ed25519_amd64_64_get_hram
+#define get_hram CRYPTO_NAMESPACE(get_hram)
 
 extern void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen);
 
diff --git a/ed25519/amd64-64-24k/index_heap.h b/ed25519/amd64-64-24k/index_heap.h
index 7dee916..6a658ee 100644
--- a/ed25519/amd64-64-24k/index_heap.h
+++ b/ed25519/amd64-64-24k/index_heap.h
@@ -3,15 +3,15 @@
 
 #include "sc25519.h"
 
-#define heap_init                crypto_sign_ed25519_amd64_64_heap_init
-#define heap_extend              crypto_sign_ed25519_amd64_64_heap_extend
-#define heap_pop                 crypto_sign_ed25519_amd64_64_heap_pop
-#define heap_push                crypto_sign_ed25519_amd64_64_heap_push
-#define heap_get2max             crypto_sign_ed25519_amd64_64_heap_get2max
-#define heap_rootreplaced        crypto_sign_ed25519_amd64_64_heap_rootreplaced
-#define heap_rootreplaced_3limbs crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-#define heap_rootreplaced_2limbs crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-#define heap_rootreplaced_1limb  crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
+#define heap_init                CRYPTO_NAMESPACE(heap_init)
+#define heap_extend              CRYPTO_NAMESPACE(heap_extend)
+#define heap_pop                 CRYPTO_NAMESPACE(heap_pop)
+#define heap_push                CRYPTO_NAMESPACE(heap_push)
+#define heap_get2max             CRYPTO_NAMESPACE(heap_get2max)
+#define heap_rootreplaced        CRYPTO_NAMESPACE(heap_rootreplaced)
+#define heap_rootreplaced_3limbs CRYPTO_NAMESPACE(heap_rootreplaced_3limbs)
+#define heap_rootreplaced_2limbs CRYPTO_NAMESPACE(heap_rootreplaced_2limbs)
+#define heap_rootreplaced_1limb  CRYPTO_NAMESPACE(heap_rootreplaced_1limb)
 
 void heap_init(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
 
diff --git a/ed25519/amd64-64-24k/sc25519.h b/ed25519/amd64-64-24k/sc25519.h
index 8ff1b1c..25d0a11 100644
--- a/ed25519/amd64-64-24k/sc25519.h
+++ b/ed25519/amd64-64-24k/sc25519.h
@@ -1,24 +1,24 @@
 #ifndef SC25519_H
 #define SC25519_H
 
-#define sc25519                  crypto_sign_ed25519_amd64_64_sc25519
-#define shortsc25519             crypto_sign_ed25519_amd64_64_shortsc25519
-#define sc25519_from32bytes      crypto_sign_ed25519_amd64_64_sc25519_from32bytes
-#define shortsc25519_from16bytes crypto_sign_ed25519_amd64_64_shortsc25519_from16bytes
-#define sc25519_from64bytes      crypto_sign_ed25519_amd64_64_sc25519_from64bytes
-#define sc25519_from_shortsc     crypto_sign_ed25519_amd64_64_sc25519_from_shortsc
-#define sc25519_to32bytes        crypto_sign_ed25519_amd64_64_sc25519_to32bytes
-#define sc25519_iszero_vartime   crypto_sign_ed25519_amd64_64_sc25519_iszero_vartime
-#define sc25519_isshort_vartime  crypto_sign_ed25519_amd64_64_sc25519_isshort_vartime
-#define sc25519_lt               crypto_sign_ed25519_amd64_64_sc25519_lt
-#define sc25519_add              crypto_sign_ed25519_amd64_64_sc25519_add
-#define sc25519_sub_nored        crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-#define sc25519_mul              crypto_sign_ed25519_amd64_64_sc25519_mul
-#define sc25519_mul_shortsc      crypto_sign_ed25519_amd64_64_sc25519_mul_shortsc
-#define sc25519_window4          crypto_sign_ed25519_amd64_64_sc25519_window4
-#define sc25519_slide          crypto_sign_ed25519_amd64_64_sc25519_slide
-#define sc25519_2interleave2     crypto_sign_ed25519_amd64_64_sc25519_2interleave2
-#define sc25519_barrett crypto_sign_ed25519_amd64_64_sc25519_barrett
+#define sc25519                  CRYPTO_NAMESPACE(sc25519)
+#define shortsc25519             CRYPTO_NAMESPACE(shortsc25519)
+#define sc25519_from32bytes      CRYPTO_NAMESPACE(sc25519_from32bytes)
+#define shortsc25519_from16bytes CRYPTO_NAMESPACE(shortsc25519_from16bytes)
+#define sc25519_from64bytes      CRYPTO_NAMESPACE(sc25519_from64bytes)
+#define sc25519_from_shortsc     CRYPTO_NAMESPACE(sc25519_from_shortsc)
+#define sc25519_to32bytes        CRYPTO_NAMESPACE(sc25519_to32bytes)
+#define sc25519_iszero_vartime   CRYPTO_NAMESPACE(sc25519_iszero_vartime)
+#define sc25519_isshort_vartime  CRYPTO_NAMESPACE(sc25519_isshort_vartime)
+#define sc25519_lt               CRYPTO_NAMESPACE(sc25519_lt)
+#define sc25519_add              CRYPTO_NAMESPACE(sc25519_add)
+#define sc25519_sub_nored        CRYPTO_NAMESPACE(sc25519_sub_nored)
+#define sc25519_mul              CRYPTO_NAMESPACE(sc25519_mul)
+#define sc25519_mul_shortsc      CRYPTO_NAMESPACE(sc25519_mul_shortsc)
+#define sc25519_window4          CRYPTO_NAMESPACE(sc25519_window4)
+#define sc25519_slide          CRYPTO_NAMESPACE(sc25519_slide)
+#define sc25519_2interleave2     CRYPTO_NAMESPACE(sc25519_2interleave2)
+#define sc25519_barrett CRYPTO_NAMESPACE(sc25519_barrett)
 
 typedef struct 
 {
diff --git a/ed25519/amd64-51-30k/sc25519_add.s b/ed25519/amd64-64-24k/sc25519_add.S
similarity index 75%
rename from ed25519/amd64-51-30k/sc25519_add.s
rename to ed25519/amd64-64-24k/sc25519_add.S
index 229beb8..b1f188b 100644
--- a/ed25519/amd64-51-30k/sc25519_add.s
+++ b/ed25519/amd64-64-24k/sc25519_add.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add
+# qhasm: enter CRYPTO_NAMESPACE(sc25519_add)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add
-.globl crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add
-_crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add:
-crypto_sign_ed25519_amd64_51_30k_batch_sc25519_add:
+.globl _CRYPTO_NAMESPACE(sc25519_add)
+.globl CRYPTO_NAMESPACE(sc25519_add)
+_CRYPTO_NAMESPACE(sc25519_add):
+CRYPTO_NAMESPACE(sc25519_add):
 mov %rsp,%r11
 and $31,%r11
 add $32,%r11
@@ -150,25 +150,25 @@ mov  %r9,%r10
 # asm 2: mov  <r3=%rsi,>t3=%r14
 mov  %rsi,%r14
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=int64#3
-# asm 2: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=%rdx
-sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,%rdx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(ORDER0),<t0=int64#3
+# asm 2: sub  CRYPTO_NAMESPACE(ORDER0),<t0=%rdx
+sub  CRYPTO_NAMESPACE(ORDER0)(%rip),%rdx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=int64#7
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=%rax
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,%rax
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=int64#7
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=%rax
+sbb  CRYPTO_NAMESPACE(ORDER1)(%rip),%rax
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=int64#12
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=%r14
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,%r14
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=int64#12
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=%r14
+sbb  CRYPTO_NAMESPACE(ORDER3)(%rip),%r14
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#3,<r0=int64#4
diff --git a/ed25519/amd64-51-30k/sc25519_barrett.s b/ed25519/amd64-64-24k/sc25519_barrett.S
similarity index 77%
rename from ed25519/amd64-51-30k/sc25519_barrett.s
rename to ed25519/amd64-64-24k/sc25519_barrett.S
index f784ea2..8c52990 100644
--- a/ed25519/amd64-51-30k/sc25519_barrett.s
+++ b/ed25519/amd64-64-24k/sc25519_barrett.S
@@ -107,13 +107,13 @@
 
 # qhasm: stack64 q33_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett
+# qhasm: enter CRYPTO_NAMESPACE(sc25519_barrett)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett
-.globl crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett
-_crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett:
-crypto_sign_ed25519_amd64_51_30k_batch_sc25519_barrett:
+.globl _CRYPTO_NAMESPACE(sc25519_barrett)
+.globl CRYPTO_NAMESPACE(sc25519_barrett)
+_CRYPTO_NAMESPACE(sc25519_barrett):
+CRYPTO_NAMESPACE(sc25519_barrett):
 mov %rsp,%r11
 and $31,%r11
 add $96,%r11
@@ -184,8 +184,8 @@ xor  %r11,%r11
 # asm 2: movq   24(<xp=%rsi),>rax=%rax
 movq   24(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU3)
+mulq CRYPTO_NAMESPACE(MU3)(%rip)
 
 # qhasm: q23 = rax
 # asm 1: mov  <rax=int64#7,>q23=int64#10
@@ -202,8 +202,8 @@ mov  %rdx,%r13
 # asm 2: movq   24(<xp=%rsi),>rax=%rax
 movq   24(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU4)
+mulq CRYPTO_NAMESPACE(MU4)(%rip)
 
 # qhasm: q24 = rax
 # asm 1: mov  <rax=int64#7,>q24=int64#12
@@ -225,8 +225,8 @@ adc %rdx,%r8
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU2)
+mulq CRYPTO_NAMESPACE(MU2)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -248,8 +248,8 @@ adc %rdx,%r13
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU3)
+mulq CRYPTO_NAMESPACE(MU3)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -281,8 +281,8 @@ adc %rdx,%r13
 # asm 2: movq   32(<xp=%rsi),>rax=%rax
 movq   32(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU4)
+mulq CRYPTO_NAMESPACE(MU4)(%rip)
 
 # qhasm: carry? q30 += rax 
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -309,8 +309,8 @@ adc %rdx,%r9
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU1)
+mulq CRYPTO_NAMESPACE(MU1)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -332,8 +332,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU2)
+mulq CRYPTO_NAMESPACE(MU2)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -365,8 +365,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU3)
+mulq CRYPTO_NAMESPACE(MU3)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -398,8 +398,8 @@ adc %rdx,%r13
 # asm 2: movq   40(<xp=%rsi),>rax=%rax
 movq   40(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU4)
+mulq CRYPTO_NAMESPACE(MU4)(%rip)
 
 # qhasm: carry? q31 += rax 
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -426,8 +426,8 @@ adc %rdx,%r10
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU0)
+mulq CRYPTO_NAMESPACE(MU0)(%rip)
 
 # qhasm: carry? q23 += rax
 # asm 1: add  <rax=int64#7,<q23=int64#10
@@ -449,8 +449,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU1)
+mulq CRYPTO_NAMESPACE(MU1)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -482,8 +482,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU2)
+mulq CRYPTO_NAMESPACE(MU2)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -515,8 +515,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU3)
+mulq CRYPTO_NAMESPACE(MU3)(%rip)
 
 # qhasm: carry? q31 += rax
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -548,8 +548,8 @@ adc %rdx,%r12
 # asm 2: movq   48(<xp=%rsi),>rax=%rax
 movq   48(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU4)
+mulq CRYPTO_NAMESPACE(MU4)(%rip)
 
 # qhasm: carry? q32 += rax 
 # asm 1: add  <rax=int64#7,<q32=int64#8
@@ -576,8 +576,8 @@ adc %rdx,%r11
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU0)
+mulq CRYPTO_NAMESPACE(MU0)(%rip)
 
 # qhasm: carry? q24 += rax
 # asm 1: add  <rax=int64#7,<q24=int64#12
@@ -601,8 +601,8 @@ adc %rdx,%r12
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU1)
+mulq CRYPTO_NAMESPACE(MU1)(%rip)
 
 # qhasm: carry? q30 += rax
 # asm 1: add  <rax=int64#7,<q30=int64#5
@@ -639,8 +639,8 @@ movq %r8,56(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU2)
+mulq CRYPTO_NAMESPACE(MU2)(%rip)
 
 # qhasm: carry? q31 += rax
 # asm 1: add  <rax=int64#7,<q31=int64#6
@@ -677,8 +677,8 @@ movq %r9,64(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU3)
+mulq CRYPTO_NAMESPACE(MU3)(%rip)
 
 # qhasm: carry? q32 += rax
 # asm 1: add  <rax=int64#7,<q32=int64#8
@@ -715,8 +715,8 @@ movq %r10,72(%rsp)
 # asm 2: movq   56(<xp=%rsi),>rax=%rax
 movq   56(%rsi),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_MU4
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_MU4
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(MU4)
+mulq CRYPTO_NAMESPACE(MU4)(%rip)
 
 # qhasm: carry? q33 += rax 
 # asm 1: add  <rax=int64#7,<q33=int64#9
@@ -743,8 +743,8 @@ movq %r11,80(%rsp)
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+mulq CRYPTO_NAMESPACE(ORDER0)(%rip)
 
 # qhasm: r20 = rax
 # asm 1: mov  <rax=int64#7,>r20=int64#5
@@ -761,8 +761,8 @@ mov  %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER1)
+mulq CRYPTO_NAMESPACE(ORDER1)(%rip)
 
 # qhasm: r21 = rax
 # asm 1: mov  <rax=int64#7,>r21=int64#8
@@ -789,8 +789,8 @@ adc %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER2)
+mulq CRYPTO_NAMESPACE(ORDER2)(%rip)
 
 # qhasm: r22 = rax
 # asm 1: mov  <rax=int64#7,>r22=int64#9
@@ -817,8 +817,8 @@ adc %rdx,%r9
 # asm 2: movq <q30_stack=56(%rsp),>rax=%rax
 movq 56(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER3
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER3)
+mulq CRYPTO_NAMESPACE(ORDER3)(%rip)
 
 # qhasm: free rdx
 
@@ -837,8 +837,8 @@ add  %r9,%r12
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+mulq CRYPTO_NAMESPACE(ORDER0)(%rip)
 
 # qhasm: carry? r21 += rax
 # asm 1: add  <rax=int64#7,<r21=int64#8
@@ -860,8 +860,8 @@ adc %rdx,%r9
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER1)
+mulq CRYPTO_NAMESPACE(ORDER1)(%rip)
 
 # qhasm: carry? r22 += rax
 # asm 1: add  <rax=int64#7,<r22=int64#9
@@ -893,8 +893,8 @@ adc %rdx,%rcx
 # asm 2: movq <q31_stack=64(%rsp),>rax=%rax
 movq 64(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER2
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER2)
+mulq CRYPTO_NAMESPACE(ORDER2)(%rip)
 
 # qhasm: free rdx
 
@@ -913,8 +913,8 @@ add  %rcx,%r12
 # asm 2: movq <q32_stack=72(%rsp),>rax=%rax
 movq 72(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+mulq CRYPTO_NAMESPACE(ORDER0)(%rip)
 
 # qhasm: carry? r22 += rax
 # asm 1: add  <rax=int64#7,<r22=int64#9
@@ -936,8 +936,8 @@ adc %rdx,%rcx
 # asm 2: movq <q32_stack=72(%rsp),>rax=%rax
 movq 72(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER1)
+mulq CRYPTO_NAMESPACE(ORDER1)(%rip)
 
 # qhasm: free rdx
 
@@ -956,8 +956,8 @@ add  %rcx,%r12
 # asm 2: movq <q33_stack=80(%rsp),>rax=%rax
 movq 80(%rsp),%rax
 
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-mulq  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
+# qhasm: (uint128) rdx rax = rax * *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+mulq CRYPTO_NAMESPACE(ORDER0)(%rip)
 
 # qhasm: free rdx
 
@@ -1026,25 +1026,25 @@ sbb  %r12,%rsi
 # asm 2: mov  <r3=%rsi,>t3=%r11
 mov  %rsi,%r11
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,%rcx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(ORDER0),<t0=int64#4
+# asm 2: sub  CRYPTO_NAMESPACE(ORDER0),<t0=%rcx
+sub  CRYPTO_NAMESPACE(ORDER0)(%rip),%rcx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,%r9
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=int64#6
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=%r9
+sbb  CRYPTO_NAMESPACE(ORDER1)(%rip),%r9
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,%r11
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=int64#9
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=%r11
+sbb  CRYPTO_NAMESPACE(ORDER3)(%rip),%r11
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#4,<r0=int64#3
@@ -1086,25 +1086,25 @@ cmovae %r11,%rsi
 # asm 2: mov  <r3=%rsi,>t3=%r11
 mov  %rsi,%r11
 
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_51_30k_batch_ORDER0,%rcx
+# qhasm: carry? t0 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER0)
+# asm 1: sub  CRYPTO_NAMESPACE(ORDER0),<t0=int64#4
+# asm 2: sub  CRYPTO_NAMESPACE(ORDER0),<t0=%rcx
+sub  CRYPTO_NAMESPACE(ORDER0)(%rip),%rcx
 
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER1,%r9
+# qhasm: carry? t1 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER1) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=int64#6
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER1),<t1=%r9
+sbb  CRYPTO_NAMESPACE(ORDER1)(%rip),%r9
 
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER2,%r10
+# qhasm: carry? t2 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER2) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=int64#8
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER2),<t2=%r10
+sbb  CRYPTO_NAMESPACE(ORDER2)(%rip),%r10
 
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_51_30k_batch_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_51_30k_batch_ORDER3,%r11
+# qhasm: unsigned<? t3 -= *(uint64 *) &CRYPTO_NAMESPACE(ORDER3) - carry
+# asm 1: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=int64#9
+# asm 2: sbb  CRYPTO_NAMESPACE(ORDER3),<t3=%r11
+sbb  CRYPTO_NAMESPACE(ORDER3)(%rip),%r11
 
 # qhasm: r0 = t0 if !unsigned<
 # asm 1: cmovae <t0=int64#4,<r0=int64#3
diff --git a/ed25519/amd64-51-30k/sc25519_lt.s b/ed25519/amd64-64-24k/sc25519_lt.S
similarity index 88%
rename from ed25519/amd64-51-30k/sc25519_lt.s
rename to ed25519/amd64-64-24k/sc25519_lt.S
index 515faa5..f4dd3b1 100644
--- a/ed25519/amd64-51-30k/sc25519_lt.s
+++ b/ed25519/amd64-64-24k/sc25519_lt.S
@@ -57,13 +57,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt
+# qhasm: enter CRYPTO_NAMESPACE(sc25519_lt)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt
-.globl crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt
-_crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt:
-crypto_sign_ed25519_amd64_51_30k_batch_sc25519_lt:
+.globl _CRYPTO_NAMESPACE(sc25519_lt)
+.globl CRYPTO_NAMESPACE(sc25519_lt)
+_CRYPTO_NAMESPACE(sc25519_lt):
+CRYPTO_NAMESPACE(sc25519_lt):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-64-24k/sc25519_mul.c b/ed25519/amd64-64-24k/sc25519_mul.c
index ca4d5ba..1ba4a55 100644
--- a/ed25519/amd64-64-24k/sc25519_mul.c
+++ b/ed25519/amd64-64-24k/sc25519_mul.c
@@ -1,6 +1,6 @@
 #include "sc25519.h"
 
-#define ull4_mul        crypto_sign_ed25519_amd64_64_ull4_mul
+#define ull4_mul        CRYPTO_NAMESPACE(ull4_mul)
 
 extern void ull4_mul(unsigned long long r[8], const unsigned long long x[4], const unsigned long long y[4]);
 
diff --git a/ed25519/amd64-51-30k/sc25519_sub_nored.s b/ed25519/amd64-64-24k/sc25519_sub_nored.S
similarity index 88%
rename from ed25519/amd64-51-30k/sc25519_sub_nored.s
rename to ed25519/amd64-64-24k/sc25519_sub_nored.S
index ff2d69a..7aa1660 100644
--- a/ed25519/amd64-51-30k/sc25519_sub_nored.s
+++ b/ed25519/amd64-64-24k/sc25519_sub_nored.S
@@ -63,13 +63,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored
+# qhasm: enter CRYPTO_NAMESPACE(sc25519_sub_nored)
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored
-.globl crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored
-_crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored:
-crypto_sign_ed25519_amd64_51_30k_batch_sc25519_sub_nored:
+.globl _CRYPTO_NAMESPACE(sc25519_sub_nored)
+.globl CRYPTO_NAMESPACE(sc25519_sub_nored)
+_CRYPTO_NAMESPACE(sc25519_sub_nored):
+CRYPTO_NAMESPACE(sc25519_sub_nored):
 mov %rsp,%r11
 and $31,%r11
 add $0,%r11
diff --git a/ed25519/amd64-51-30k/ull4_mul.s b/ed25519/amd64-64-24k/ull4_mul.S
similarity index 98%
rename from ed25519/amd64-51-30k/ull4_mul.s
rename to ed25519/amd64-64-24k/ull4_mul.S
index 256edd1..1439761 100644
--- a/ed25519/amd64-51-30k/ull4_mul.s
+++ b/ed25519/amd64-64-24k/ull4_mul.S
@@ -77,13 +77,13 @@
 
 # qhasm:   stack64 caller7_stack
 
-# qhasm: enter crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul 
+# qhasm: enter CRYPTO_NAMESPACE(ull4_mul) 
 .text
 .p2align 5
-.globl _crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul
-.globl crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul
-_crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul:
-crypto_sign_ed25519_amd64_51_30k_batch_ull4_mul:
+.globl _CRYPTO_NAMESPACE(ull4_mul)
+.globl CRYPTO_NAMESPACE(ull4_mul)
+_CRYPTO_NAMESPACE(ull4_mul):
+CRYPTO_NAMESPACE(ull4_mul):
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/ed25519/ed25519.h b/ed25519/ed25519.h
index 6f4c37a..d24a4be 100644
--- a/ed25519/ed25519.h
+++ b/ed25519/ed25519.h
@@ -1,251 +1,3 @@
 #define ED25519_SEEDBYTES      32
 #define ED25519_SECRETKEYBYTES 64
 #define ED25519_PUBLICKEYBYTES 32
-
-
-#ifndef ED25519_donna
-#  if defined(_MSC_VER)
-#    define ALIGN(x) __declspec(align(x))
-#  elif defined(__GNUC__)
-#    undef ALIGN
-#    define ALIGN(x) __attribute__((aligned(x)))
-#  else
-#    ifndef ALIGN
-#      define ALIGN(x)
-#    endif
-#  endif
-#endif
-
-
-#ifdef ED25519_ref10
-
-#include "ref10/ed25519.h"
-#define ed25519_seckey        ed25519_ref10_seckey
-#define ed25519_seckey_expand ed25519_ref10_seckey_expand
-#define ed25519_pubkey        ed25519_ref10_pubkey
-#define ed25519_keygen        ed25519_ref10_keygen
-#include "ref10/ge.h"
-
-/* The basepoint multiplied by 8. */
-static const ge_cached ge_eightpoint = {
-  /* YplusX */
-  {
-    48496028, -16430416, 15164263, 11885335, 60784617, -4866353, 46481863,
-    -2771805, 9708580, 2387263
-  },
-  /* YmunusX */
-  {
-    -10173472, -5540046, 21277639, 4080693, 1932823, -14916249, -9515873,
-    -21787995, -36575460, 29827857
-  },
-  /* Z */
-  {
-    25143927, -10256223, -3515585, 5715072, 19432778, -14905909, 22462083,
-    -8862871, 13226552, 743677
-  },
-  /* T2d */
-  {
-    -784818, -8208065, -28479270, 5551579, 15746872, 4911053, 19117091,
-    11267669, -24569594, 14624995
-  }
-};
-inline static void ge_initeightpoint(void) {}
-
-#endif
-
-
-#ifdef ED25519_amd64_51_30k
-
-#include "amd64-51-30k/ed25519.h"
-#include "amd64-51-30k/ge25519.h"
-#define ed25519_seckey        ed25519_amd64_51_30k_seckey
-#define ed25519_seckey_expand ed25519_amd64_51_30k_seckey_expand
-#define ed25519_pubkey        ed25519_amd64_51_30k_pubkey
-#define ed25519_keygen        ed25519_amd64_51_30k_keygen
-
-#endif
-
-
-#ifdef ED25519_amd64_64_24k
-
-#include "amd64-64-24k/ed25519.h"
-#include "amd64-64-24k/ge25519.h"
-#define ed25519_seckey        ed25519_amd64_64_seckey
-#define ed25519_seckey_expand ed25519_amd64_64_seckey_expand
-#define ed25519_pubkey        ed25519_amd64_64_pubkey
-#define ed25519_keygen        ed25519_amd64_64_keygen
-
-#endif
-
-
-// common
-#if defined(ED25519_amd64_51_30k) || defined(ED25519_amd64_64_24k)
-
-#define fe            fe25519
-#define ge_p1p1       ge25519_p1p1
-#define ge_p3         ge25519_p3
-#define ge_p1p1_to_p3 ge25519_p1p1_to_p3
-#define ge_p3_tobytes ge25519_pack
-#define ge_add        ge25519_pnielsadd_p1p1
-
-#define ge_p3_batchtobytes_destructive_1      ge25519_batchpack_destructive_1
-#define ge_p3_batchtobytes_destructive_finish ge25519_batchpack_destructive_finish
-
-#endif
-
-
-#ifdef ED25519_amd64_51_30k
-static inline void ge_scalarmult_base(ge_p3 *gepk,const unsigned char *sk)
-{
-	sc25519 scsk;
-
-	sc25519_from32bytes(&scsk,sk);
-	ge25519_scalarmult_base(gepk,&scsk);
-}
-
-/* The basepoint multiplied by 8. */
-static const ge25519_pniels ge_eightpoint = {
-	// ysubx
-	{{ 1880013609944032, 273850692840390, 1250787290086935, 789632210881694, 2001713562248987 }},
-	// xaddy
-	{{ 1149173309373852, 797611345273702, 1925224452816873, 2065787175387590, 160206517707811 }},
-	// z
-	{{ 1563516364368503, 383531986082622, 1251481213240650, 1657022631558786, 49907331879479 }},
-	// t2d
-	{{ 1700965895112270, 372560131616985, 329575203620664, 756160485635107, 981466775886086 }},
-};
-inline static void ge_initeightpoint(void) {}
-#endif
-
-
-#ifdef ED25519_amd64_64_24k
-static inline void ge_scalarmult_base(ge_p3 *gepk,const unsigned char *sk)
-{
-	sc25519 scsk;
-
-	sc25519_from32bytes(&scsk,sk);
-	ge25519_scalarmult_base(gepk,&scsk);
-}
-
-/* The basepoint multiplied by 8. */
-static const ge25519_pniels ge_eightpoint = {
-	// ysubx
-	{{ 6788804652057281504U, 531290374162262565U, 6135835192563885415U, 8199018750971852188U }},
-	// xaddy
-	{{ 1960215011215539612U, 16708348392717346619U, 11897818088205565647U, 656205896531197613U }},
-	// z
-	{{ 15705615417005288055U, 5341641389565279826U, 1966574939768917451U, 204420431378348998U }},
-	// t2d
-	{{ 9713713562319586894U, 4328467261753610859U, 8262494979546083277U, 4020087914029409631U }},
-};
-inline static void ge_initeightpoint(void) {}
-#endif
-
-
-#ifdef ED25519_donna
-
-#define ED25519_CUSTOMRANDOM
-#define ED25519_CUSTOMHASH
-#include <sodium/crypto_hash_sha512.h>
-#include <sodium/randombytes.h>
-#include "ed25519-donna/ed25519-donna.h"
-
-static int ed25519_seckey_expand(unsigned char *sk,const unsigned char *seed)
-{
-	crypto_hash_sha512(sk,seed,32);
-	sk[0] &= 248;
-	sk[31] &= 127;
-	sk[31] |= 64;
-
-	return 0;
-}
-
-static int ed25519_seckey(unsigned char *sk)
-{
-	unsigned char seed[32];
-
-	randombytes(seed,32);
-	return ed25519_seckey_expand(sk,seed);
-}
-
-static int ed25519_pubkey(unsigned char *pk,const unsigned char *sk)
-{
-	bignum256modm a;
-	ge25519 ALIGN(16) A;
-
-	expand256_modm(a,sk,32);
-	ge25519_scalarmult_base_niels(&A,ge25519_niels_base_multiples,a);
-	ge25519_pack(pk,&A);
-
-	return 0;
-}
-
-
-static int ed25519_keypair(unsigned char *pk,unsigned char *sk)
-{
-	ed25519_seckey(sk);
-	ed25519_pubkey(pk,sk);
-
-	return 0;
-}
-
-#define fe      bignum25519
-#define ge_p1p1 ge25519_p1p1
-#define ge_p3   ge25519
-
-#define ge_p1p1_to_p3 ge25519_p1p1_to_full
-#define ge_p3_tobytes ge25519_pack
-
-#define ge_p3_batchtobytes_destructive_1      ge25519_batchpack_destructive_1
-#define ge_p3_batchtobytes_destructive_finish ge25519_batchpack_destructive_finish
-
-DONNA_INLINE static void ge_add(ge25519_p1p1 *r,const ge25519 *p,const ge25519_pniels *q)
-{
-	ge25519_pnielsadd_p1p1(r,p,q,0);
-}
-
-DONNA_INLINE static void ge_scalarmult_base(ge25519 *A,const unsigned char *sk)
-{
-	bignum256modm ALIGN(16) a;
-	expand256_modm(a,sk,32);
-	ge25519_scalarmult_base_niels(A,ge25519_niels_base_multiples,a);
-}
-
-static ge25519_pniels ALIGN(16) ge_eightpoint;
-// portable representation of (basepoint * 8)
-static u8 fe_ysubx[32] = {
-	0xE0,0xC3,0x64,0xC7,0xDC,0xAD,0x36,0x5E,
-	0x25,0xAA,0x86,0xC8,0xC7,0x85,0x5F,0x07,
-	0x67,0x65,0x1C,0x3D,0x99,0xDD,0x26,0x55,
-	0x9C,0xB5,0x71,0x1E,0x1D,0xC4,0xC8,0x71,
-};
-static u8 fe_xaddy[32] = {
-	0x9C,0xFD,0xE3,0xC2,0x2A,0x15,0x34,0x1B,
-	0x3B,0xE7,0x62,0xAB,0x56,0xFA,0xDF,0xE7,
-	0xCF,0xBE,0xB5,0x8D,0x83,0x8A,0x1D,0xA5,
-	0xAD,0x3E,0x42,0x42,0xC9,0x4F,0x1B,0x09,
-};
-static u8 fe_z[32] = {
-	0x77,0xAA,0x7F,0x85,0x02,0x8E,0xF5,0xD9,
-	0x52,0xFE,0x8F,0xE6,0x8A,0x52,0x21,0x4A,
-	0xCB,0x8D,0x1C,0x05,0x7D,0xAD,0x4A,0x1B,
-	0xC6,0x7B,0x23,0x9D,0x4C,0x3F,0xD6,0x02,
-};
-static u8 fe_t2d[32] = {
-	0x4E,0x06,0xF4,0xFB,0x04,0x0B,0xCE,0x86,
-	0x6B,0x52,0xBB,0x96,0x0A,0xCE,0x11,0x3C,
-	0xCD,0xEF,0x4A,0x46,0x68,0x47,0xAA,0x72,
-	0x5F,0x65,0x90,0x91,0xA8,0x38,0xCA,0x37,
-};
-
-// initialize from packed representation
-static void ge_initeightpoint(void)
-{
-	memset(&ge_eightpoint,0,sizeof(ge_eightpoint));
-	curve25519_expand(ge_eightpoint.ysubx,fe_ysubx);
-	curve25519_expand(ge_eightpoint.xaddy,fe_xaddy);
-	curve25519_expand(ge_eightpoint.z,fe_z);
-	curve25519_expand(ge_eightpoint.t2d,fe_t2d);
-}
-
-#endif
diff --git a/ed25519/ed25519_impl_post.h b/ed25519/ed25519_impl_post.h
new file mode 100644
index 0000000..0f5a3e8
--- /dev/null
+++ b/ed25519/ed25519_impl_post.h
@@ -0,0 +1,85 @@
+
+#undef ed25519_seckey
+#undef ed25519_seckey_expand
+#undef ed25519_pubkey
+#undef ed25519_keygen
+
+#undef ge_eightpoint
+#undef ge_initeightpoint
+
+#undef ge_add
+#undef ge_p3_batchtobytes_destructive_1
+#undef ge_p3_batchtobytes_destructive_finish
+#undef ge_scalarmult_base
+
+
+#ifdef ED25519_ref10
+
+#undef ge_frombytes_negate_vartime
+#undef ge_tobytes
+#undef ge_p3_tobytes
+#undef ge_p2_0
+#undef ge_p3_0
+#undef ge_precomp_0
+#undef ge_p3_to_p2
+#undef ge_p3_to_cached
+#undef ge_p1p1_to_p2
+#undef ge_p1p1_to_p3
+#undef ge_p2_dbl
+#undef ge_p3_dbl
+#undef ge_madd
+#undef ge_msub
+#undef ge_sub
+#undef ge_scalarmult_base
+#undef ge_double_scalarmult_vartime
+
+#endif
+
+
+#if defined(ED25519_amd64_51_30k) || defined(ED25519_amd64_64_24k)
+
+#undef ge25519
+#undef ge25519_base
+#undef ge25519_unpackneg_vartime
+#undef ge25519_pack
+#undef ge25519_isneutral_vartime
+#undef ge25519_add
+#undef ge25519_double
+#undef ge25519_double_scalarmult_vartime
+#undef ge25519_multi_scalarmult_vartime
+#undef ge25519_scalarmult_base
+#undef ge25519_p1p1_to_p2
+#undef ge25519_p1p1_to_p3
+#undef ge25519_p1p1_to_pniels
+#undef ge25519_add_p1p1
+#undef ge25519_dbl_p1p1
+#undef choose_t
+#undef choose_t_smultq
+#undef ge25519_nielsadd2
+#undef ge25519_nielsadd_p1p1
+#undef ge25519_pnielsadd_p1p1
+#undef ge25519_p3
+
+#undef fe
+#undef ge_p1p1
+#undef ge_p3
+#undef ge_p1p1_to_p3
+#undef ge_p3_tobytes
+
+#endif
+
+
+#ifdef ED25519_donna
+
+#undef fe_ysubx
+#undef fe_xaddy
+#undef fe_z
+#undef fe_t2d
+
+#undef fe
+#undef ge_p1p1
+#undef ge_p3
+#undef ge_p1p1_to_p3
+#undef ge_p3_tobytes
+
+#endif
diff --git a/ed25519/ed25519_impl_pre.h b/ed25519/ed25519_impl_pre.h
new file mode 100644
index 0000000..375c9b0
--- /dev/null
+++ b/ed25519/ed25519_impl_pre.h
@@ -0,0 +1,255 @@
+#ifndef ED25519_donna
+#  if defined(_MSC_VER)
+#    define ALIGN(x) __declspec(align(x))
+#  elif defined(__GNUC__)
+#    undef ALIGN
+#    define ALIGN(x) __attribute__((aligned(x)))
+#  else
+#    ifndef ALIGN
+#      define ALIGN(x)
+#    endif
+#  endif
+#endif
+
+
+#define ed25519_seckey        CRYPTO_NAMESPACE(seckey)
+#define ed25519_seckey_expand CRYPTO_NAMESPACE(seckey_expand)
+#define ed25519_pubkey        CRYPTO_NAMESPACE(pubkey)
+#define ed25519_keygen        CRYPTO_NAMESPACE(keygen)
+
+#define ge_eightpoint     CRYPTO_NAMESPACE(ge_eightpoint)
+#define ge_initeightpoint CRYPTO_NAMESPACE(ge_initeightpoint)
+
+
+#ifdef ED25519_ref10
+
+#include "ref10/crypto_sign.h"
+#include "ref10/ge.h"
+
+/* The basepoint multiplied by 8. */
+static const ge_cached ge_eightpoint = {
+  /* YplusX */
+  {
+    48496028, -16430416, 15164263, 11885335, 60784617, -4866353, 46481863,
+    -2771805, 9708580, 2387263
+  },
+  /* YmunusX */
+  {
+    -10173472, -5540046, 21277639, 4080693, 1932823, -14916249, -9515873,
+    -21787995, -36575460, 29827857
+  },
+  /* Z */
+  {
+    25143927, -10256223, -3515585, 5715072, 19432778, -14905909, 22462083,
+    -8862871, 13226552, 743677
+  },
+  /* T2d */
+  {
+    -784818, -8208065, -28479270, 5551579, 15746872, 4911053, 19117091,
+    11267669, -24569594, 14624995
+  }
+};
+inline static void ge_initeightpoint(void) {}
+
+#endif
+
+
+#ifdef ED25519_amd64_51_30k
+
+#include "amd64-51-30k/crypto_sign.h"
+#include "amd64-51-30k/ge25519.h"
+
+#endif
+
+
+#ifdef ED25519_amd64_64_24k
+
+#include "amd64-64-24k/crypto_sign.h"
+#include "amd64-64-24k/ge25519.h"
+
+#endif
+
+
+// common
+#if defined(ED25519_amd64_51_30k) || defined(ED25519_amd64_64_24k)
+
+#define fe            fe25519
+#define ge_p1p1       ge25519_p1p1
+#define ge_p3         ge25519_p3
+#define ge_p1p1_to_p3 ge25519_p1p1_to_p3
+#define ge_p3_tobytes ge25519_pack
+#define ge_add        ge25519_pnielsadd_p1p1
+
+#define ge_p3_batchtobytes_destructive_1      ge25519_batchpack_destructive_1
+#define ge_p3_batchtobytes_destructive_finish ge25519_batchpack_destructive_finish
+
+#define ge_scalarmult_base CRYPTO_NAMESPACE(ge_scalarmult_base)
+
+#endif
+
+
+#ifdef ED25519_amd64_51_30k
+static inline void ge_scalarmult_base(ge_p3 *gepk,const unsigned char *sk)
+{
+	sc25519 scsk;
+
+	sc25519_from32bytes(&scsk,sk);
+	ge25519_scalarmult_base(gepk,&scsk);
+}
+
+/* The basepoint multiplied by 8. */
+static const ge25519_pniels ge_eightpoint = {
+	// ysubx
+	{{ 1880013609944032, 273850692840390, 1250787290086935, 789632210881694, 2001713562248987 }},
+	// xaddy
+	{{ 1149173309373852, 797611345273702, 1925224452816873, 2065787175387590, 160206517707811 }},
+	// z
+	{{ 1563516364368503, 383531986082622, 1251481213240650, 1657022631558786, 49907331879479 }},
+	// t2d
+	{{ 1700965895112270, 372560131616985, 329575203620664, 756160485635107, 981466775886086 }},
+};
+inline static void ge_initeightpoint(void) {}
+#endif
+
+
+#ifdef ED25519_amd64_64_24k
+static inline void ge_scalarmult_base(ge_p3 *gepk,const unsigned char *sk)
+{
+	sc25519 scsk;
+
+	sc25519_from32bytes(&scsk,sk);
+	ge25519_scalarmult_base(gepk,&scsk);
+}
+
+/* The basepoint multiplied by 8. */
+static const ge25519_pniels ge_eightpoint = {
+	// ysubx
+	{{ 6788804652057281504U, 531290374162262565U, 6135835192563885415U, 8199018750971852188U }},
+	// xaddy
+	{{ 1960215011215539612U, 16708348392717346619U, 11897818088205565647U, 656205896531197613U }},
+	// z
+	{{ 15705615417005288055U, 5341641389565279826U, 1966574939768917451U, 204420431378348998U }},
+	// t2d
+	{{ 9713713562319586894U, 4328467261753610859U, 8262494979546083277U, 4020087914029409631U }},
+};
+inline static void ge_initeightpoint(void) {}
+#endif
+
+
+#ifdef ED25519_donna
+
+#define ED25519_CUSTOMRANDOM
+#define ED25519_CUSTOMHASH
+#include <sodium/crypto_hash_sha512.h>
+#include <sodium/randombytes.h>
+#include "ed25519-donna/ed25519-donna.h"
+
+static int ed25519_seckey_expand(unsigned char *sk,const unsigned char *seed)
+{
+	crypto_hash_sha512(sk,seed,32);
+	sk[0] &= 248;
+	sk[31] &= 127;
+	sk[31] |= 64;
+
+	return 0;
+}
+
+static int ed25519_seckey(unsigned char *sk)
+{
+	unsigned char seed[32];
+
+	randombytes(seed,32);
+	return ed25519_seckey_expand(sk,seed);
+}
+
+static int ed25519_pubkey(unsigned char *pk,const unsigned char *sk)
+{
+	bignum256modm a;
+	ge25519 ALIGN(16) A;
+
+	expand256_modm(a,sk,32);
+	ge25519_scalarmult_base_niels(&A,ge25519_niels_base_multiples,a);
+	ge25519_pack(pk,&A);
+
+	return 0;
+}
+
+
+static int ed25519_keypair(unsigned char *pk,unsigned char *sk)
+{
+	ed25519_seckey(sk);
+	ed25519_pubkey(pk,sk);
+
+	return 0;
+}
+
+#define fe      bignum25519
+#define ge_p1p1 ge25519_p1p1
+#define ge_p3   ge25519
+
+#define ge_p1p1_to_p3 ge25519_p1p1_to_full
+#define ge_p3_tobytes ge25519_pack
+
+#define ge_p3_batchtobytes_destructive_1      ge25519_batchpack_destructive_1
+#define ge_p3_batchtobytes_destructive_finish ge25519_batchpack_destructive_finish
+
+
+#define ge_add             CRYPTO_NAMESPACE(ge_add)
+#define ge_scalarmult_base CRYPTO_NAMESPACE(ge_scalarmult_base)
+
+
+DONNA_INLINE static void ge_add(ge25519_p1p1 *r,const ge25519 *p,const ge25519_pniels *q)
+{
+	ge25519_pnielsadd_p1p1(r,p,q,0);
+}
+
+DONNA_INLINE static void ge_scalarmult_base(ge25519 *A,const unsigned char *sk)
+{
+	bignum256modm ALIGN(16) a;
+	expand256_modm(a,sk,32);
+	ge25519_scalarmult_base_niels(A,ge25519_niels_base_multiples,a);
+}
+
+#define fe_ysubx CRYPTO_NAMESPACE(fe_ysubx)
+#define fe_xaddy CRYPTO_NAMESPACE(fe_xaddy)
+#define fe_z     CRYPTO_NAMESPACE(fe_z)
+#define fe_t2d   CRYPTO_NAMESPACE(fe_t2d)
+
+static ge25519_pniels ALIGN(16) ge_eightpoint;
+// portable representation of (basepoint * 8)
+static u8 fe_ysubx[32] = {
+	0xE0,0xC3,0x64,0xC7,0xDC,0xAD,0x36,0x5E,
+	0x25,0xAA,0x86,0xC8,0xC7,0x85,0x5F,0x07,
+	0x67,0x65,0x1C,0x3D,0x99,0xDD,0x26,0x55,
+	0x9C,0xB5,0x71,0x1E,0x1D,0xC4,0xC8,0x71,
+};
+static u8 fe_xaddy[32] = {
+	0x9C,0xFD,0xE3,0xC2,0x2A,0x15,0x34,0x1B,
+	0x3B,0xE7,0x62,0xAB,0x56,0xFA,0xDF,0xE7,
+	0xCF,0xBE,0xB5,0x8D,0x83,0x8A,0x1D,0xA5,
+	0xAD,0x3E,0x42,0x42,0xC9,0x4F,0x1B,0x09,
+};
+static u8 fe_z[32] = {
+	0x77,0xAA,0x7F,0x85,0x02,0x8E,0xF5,0xD9,
+	0x52,0xFE,0x8F,0xE6,0x8A,0x52,0x21,0x4A,
+	0xCB,0x8D,0x1C,0x05,0x7D,0xAD,0x4A,0x1B,
+	0xC6,0x7B,0x23,0x9D,0x4C,0x3F,0xD6,0x02,
+};
+static u8 fe_t2d[32] = {
+	0x4E,0x06,0xF4,0xFB,0x04,0x0B,0xCE,0x86,
+	0x6B,0x52,0xBB,0x96,0x0A,0xCE,0x11,0x3C,
+	0xCD,0xEF,0x4A,0x46,0x68,0x47,0xAA,0x72,
+	0x5F,0x65,0x90,0x91,0xA8,0x38,0xCA,0x37,
+};
+
+// initialize from packed representation
+static void ge_initeightpoint(void)
+{
+	memset(&ge_eightpoint,0,sizeof(ge_eightpoint));
+	curve25519_expand(ge_eightpoint.ysubx,fe_ysubx);
+	curve25519_expand(ge_eightpoint.xaddy,fe_xaddy);
+	curve25519_expand(ge_eightpoint.z,fe_z);
+	curve25519_expand(ge_eightpoint.t2d,fe_t2d);
+}
+
+#endif
diff --git a/ed25519/ref10/crypto_sign.h b/ed25519/ref10/crypto_sign.h
index 71b2543..35b0a74 100644
--- a/ed25519/ref10/crypto_sign.h
+++ b/ed25519/ref10/crypto_sign.h
@@ -1,8 +1,9 @@
-#define crypto_sign ed25519_ref10_sign
-#define crypto_sign_keypair ed25519_ref10_keygen
-#define crypto_sign_seckey ed25519_ref10_seckey
-#define crypto_sign_seckey_expand ed25519_ref10_seckey_expand
-#define crypto_sign_pubkey ed25519_ref10_pubkey
-#define crypto_sign_open ed25519_ref10_open
+#define crypto_sign               CRYPTO_NAMESPACE(sign)
+#define crypto_sign_keypair       CRYPTO_NAMESPACE(keygen)
+#define crypto_sign_seckey        CRYPTO_NAMESPACE(seckey)
+#define crypto_sign_seckey_expand CRYPTO_NAMESPACE(seckey_expand)
+#define crypto_sign_pubkey        CRYPTO_NAMESPACE(pubkey)
+#define crypto_sign_open          CRYPTO_NAMESPACE(open)
+#define crypto_sign_open_batch    CRYPTO_NAMESPACE(open_batch)
 
 #include "ed25519.h"
diff --git a/ed25519/ref10/ed25519.h b/ed25519/ref10/ed25519.h
index 406aafc..2122ad5 100644
--- a/ed25519/ref10/ed25519.h
+++ b/ed25519/ref10/ed25519.h
@@ -1,13 +1,13 @@
-int ed25519_ref10_seckey(unsigned char *sk);
-int ed25519_ref10_seckey_expand(unsigned char *sk,const unsigned char *seed);
-int ed25519_ref10_pubkey(unsigned char *pk,const unsigned char *sk);
-int ed25519_ref10_keygen(unsigned char *pk,unsigned char *sk);
-int ed25519_ref10_sign(
+int crypto_sign_seckey(unsigned char *sk);
+int crypto_sign_seckey_expand(unsigned char *sk,const unsigned char *seed);
+int crypto_sign_pubkey(unsigned char *pk,const unsigned char *sk);
+int crypto_sign_keypair(unsigned char *pk,unsigned char *sk);
+int crypto_sign(
   unsigned char *sm,unsigned long long *smlen,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *sk
 );
-int ed25519_ref10_open(
+int crypto_sign_open(
   unsigned char *m,unsigned long long *mlen,
   const unsigned char *sm,unsigned long long smlen,
   const unsigned char *pk
diff --git a/ed25519/ref10/fe.h b/ed25519/ref10/fe.h
index 11aeebb..f4ec2bf 100644
--- a/ed25519/ref10/fe.h
+++ b/ed25519/ref10/fe.h
@@ -14,25 +14,25 @@ t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
 Bounds on each t[i] vary depending on context.
 */
 
-#define fe_frombytes crypto_sign_ed25519_ref10_fe_frombytes
-#define fe_tobytes crypto_sign_ed25519_ref10_fe_tobytes
-#define fe_copy crypto_sign_ed25519_ref10_fe_copy
-#define fe_isnonzero crypto_sign_ed25519_ref10_fe_isnonzero
-#define fe_isnegative crypto_sign_ed25519_ref10_fe_isnegative
-#define fe_0 crypto_sign_ed25519_ref10_fe_0
-#define fe_1 crypto_sign_ed25519_ref10_fe_1
-#define fe_cswap crypto_sign_ed25519_ref10_fe_cswap
-#define fe_cmov crypto_sign_ed25519_ref10_fe_cmov
-#define fe_add crypto_sign_ed25519_ref10_fe_add
-#define fe_sub crypto_sign_ed25519_ref10_fe_sub
-#define fe_neg crypto_sign_ed25519_ref10_fe_neg
-#define fe_mul crypto_sign_ed25519_ref10_fe_mul
-#define fe_sq crypto_sign_ed25519_ref10_fe_sq
-#define fe_sq2 crypto_sign_ed25519_ref10_fe_sq2
-#define fe_mul121666 crypto_sign_ed25519_ref10_fe_mul121666
-#define fe_invert crypto_sign_ed25519_ref10_fe_invert
-#define fe_batchinvert crypto_sign_ed25519_ref10_fe_batchinvert
-#define fe_pow22523 crypto_sign_ed25519_ref10_fe_pow22523
+#define fe_frombytes CRYPTO_NAMESPACE(fe_frombytes)
+#define fe_tobytes CRYPTO_NAMESPACE(fe_tobytes)
+#define fe_copy CRYPTO_NAMESPACE(fe_copy)
+#define fe_isnonzero CRYPTO_NAMESPACE(fe_isnonzero)
+#define fe_isnegative CRYPTO_NAMESPACE(fe_isnegative)
+#define fe_0 CRYPTO_NAMESPACE(fe_0)
+#define fe_1 CRYPTO_NAMESPACE(fe_1)
+#define fe_cswap CRYPTO_NAMESPACE(fe_cswap)
+#define fe_cmov CRYPTO_NAMESPACE(fe_cmov)
+#define fe_add CRYPTO_NAMESPACE(fe_add)
+#define fe_sub CRYPTO_NAMESPACE(fe_sub)
+#define fe_neg CRYPTO_NAMESPACE(fe_neg)
+#define fe_mul CRYPTO_NAMESPACE(fe_mul)
+#define fe_sq CRYPTO_NAMESPACE(fe_sq)
+#define fe_sq2 CRYPTO_NAMESPACE(fe_sq2)
+#define fe_mul121666 CRYPTO_NAMESPACE(fe_mul121666)
+#define fe_invert CRYPTO_NAMESPACE(fe_invert)
+#define fe_batchinvert CRYPTO_NAMESPACE(fe_batchinvert)
+#define fe_pow22523 CRYPTO_NAMESPACE(fe_pow22523)
 
 extern void fe_frombytes(fe,const unsigned char *);
 extern void fe_tobytes(unsigned char *,const fe);
diff --git a/ed25519/ref10/fe_isnonzero.c b/ed25519/ref10/fe_isnonzero.c
index 0261e92..4756800 100644
--- a/ed25519/ref10/fe_isnonzero.c
+++ b/ed25519/ref10/fe_isnonzero.c
@@ -9,7 +9,7 @@ Preconditions:
    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
 */
 
-static const unsigned char zero[32] = {0};
+static const unsigned char zero[32];
 
 int fe_isnonzero(const fe f)
 {
diff --git a/ed25519/ref10/ge.h b/ed25519/ref10/ge.h
index 3ae05b6..c69a5b3 100644
--- a/ed25519/ref10/ge.h
+++ b/ed25519/ref10/ge.h
@@ -52,28 +52,28 @@ typedef struct {
 
 typedef unsigned char bytes32[32];
 
-#define ge_frombytes_negate_vartime crypto_sign_ed25519_ref10_ge_frombytes_negate_vartime
-#define ge_tobytes crypto_sign_ed25519_ref10_ge_tobytes
-#define ge_p3_tobytes crypto_sign_ed25519_ref10_ge_p3_tobytes
-#define ge_p3_batchtobytes_destructive_1 crypto_sign_ed25519_ref10_ge_p3_batchtobytes_destructive_1
-#define ge_p3_batchtobytes_destructive_finish crypto_sign_ed25519_ref10_ge_p3_batchtobytes_destructive_finish
+#define ge_frombytes_negate_vartime CRYPTO_NAMESPACE(ge_frombytes_negate_vartime)
+#define ge_tobytes CRYPTO_NAMESPACE(ge_tobytes)
+#define ge_p3_tobytes CRYPTO_NAMESPACE(ge_p3_tobytes)
+#define ge_p3_batchtobytes_destructive_1 CRYPTO_NAMESPACE(ge_p3_batchtobytes_destructive_1)
+#define ge_p3_batchtobytes_destructive_finish CRYPTO_NAMESPACE(ge_p3_batchtobytes_destructive_finish)
 
-#define ge_p2_0 crypto_sign_ed25519_ref10_ge_p2_0
-#define ge_p3_0 crypto_sign_ed25519_ref10_ge_p3_0
-#define ge_precomp_0 crypto_sign_ed25519_ref10_ge_precomp_0
-#define ge_p3_to_p2 crypto_sign_ed25519_ref10_ge_p3_to_p2
-#define ge_p3_to_cached crypto_sign_ed25519_ref10_ge_p3_to_cached
-#define ge_p1p1_to_p2 crypto_sign_ed25519_ref10_ge_p1p1_to_p2
-#define ge_p1p1_to_p3 crypto_sign_ed25519_ref10_ge_p1p1_to_p3
-#define ge_p2_dbl crypto_sign_ed25519_ref10_ge_p2_dbl
-#define ge_p3_dbl crypto_sign_ed25519_ref10_ge_p3_dbl
+#define ge_p2_0 CRYPTO_NAMESPACE(ge_p2_0)
+#define ge_p3_0 CRYPTO_NAMESPACE(ge_p3_0)
+#define ge_precomp_0 CRYPTO_NAMESPACE(ge_precomp_0)
+#define ge_p3_to_p2 CRYPTO_NAMESPACE(ge_p3_to_p2)
+#define ge_p3_to_cached CRYPTO_NAMESPACE(ge_p3_to_cached)
+#define ge_p1p1_to_p2 CRYPTO_NAMESPACE(ge_p1p1_to_p2)
+#define ge_p1p1_to_p3 CRYPTO_NAMESPACE(ge_p1p1_to_p3)
+#define ge_p2_dbl CRYPTO_NAMESPACE(ge_p2_dbl)
+#define ge_p3_dbl CRYPTO_NAMESPACE(ge_p3_dbl)
 
-#define ge_madd crypto_sign_ed25519_ref10_ge_madd
-#define ge_msub crypto_sign_ed25519_ref10_ge_msub
-#define ge_add crypto_sign_ed25519_ref10_ge_add
-#define ge_sub crypto_sign_ed25519_ref10_ge_sub
-#define ge_scalarmult_base crypto_sign_ed25519_ref10_ge_scalarmult_base
-#define ge_double_scalarmult_vartime crypto_sign_ed25519_ref10_ge_double_scalarmult_vartime
+#define ge_madd CRYPTO_NAMESPACE(ge_madd)
+#define ge_msub CRYPTO_NAMESPACE(ge_msub)
+#define ge_add CRYPTO_NAMESPACE(ge_add)
+#define ge_sub CRYPTO_NAMESPACE(ge_sub)
+#define ge_scalarmult_base CRYPTO_NAMESPACE(ge_scalarmult_base)
+#define ge_double_scalarmult_vartime CRYPTO_NAMESPACE(ge_double_scalarmult_vartime)
 
 extern void ge_tobytes(unsigned char *,const ge_p2 *);
 extern void ge_p3_tobytes(unsigned char *,const ge_p3 *);
diff --git a/ed25519/ref10/ge_double_scalarmult.c b/ed25519/ref10/ge_double_scalarmult.c
index f8bf4bf..a2df6e9 100644
--- a/ed25519/ref10/ge_double_scalarmult.c
+++ b/ed25519/ref10/ge_double_scalarmult.c
@@ -32,7 +32,7 @@ static void slide(signed char *r,const unsigned char *a)
 
 }
 
-static ge_precomp Bi[8] = {
+static const ge_precomp Bi[8] = {
 #include "base2.h"
 } ;
 
diff --git a/ed25519/ref10/ge_p3_tobytes.c b/ed25519/ref10/ge_p3_tobytes.c
index b251f60..21cb2fc 100644
--- a/ed25519/ref10/ge_p3_tobytes.c
+++ b/ed25519/ref10/ge_p3_tobytes.c
@@ -1,6 +1,6 @@
 #include "ge.h"
 
-void ge_p3_tobytes(bytes32 s,const ge_p3 *h)
+void ge_p3_tobytes(unsigned char *s,const ge_p3 *h)
 {
   fe recip;
   fe x;
diff --git a/ed25519/ref10/ge_scalarmult_base.c b/ed25519/ref10/ge_scalarmult_base.c
index 421e4fa..6707547 100644
--- a/ed25519/ref10/ge_scalarmult_base.c
+++ b/ed25519/ref10/ge_scalarmult_base.c
@@ -19,7 +19,7 @@ static unsigned char negative(signed char b)
   return x;
 }
 
-static void cmov(ge_precomp *t,ge_precomp *u,unsigned char b)
+static void cmov(ge_precomp *t,const ge_precomp *u,unsigned char b)
 {
   fe_cmov(t->yplusx,u->yplusx,b);
   fe_cmov(t->yminusx,u->yminusx,b);
@@ -27,7 +27,7 @@ static void cmov(ge_precomp *t,ge_precomp *u,unsigned char b)
 }
 
 /* base[i][j] = (j+1)*256^i*B */
-static ge_precomp base[32][8] = {
+static const ge_precomp base[32][8] = {
 #include "base.h"
 } ;
 
diff --git a/ed25519/ref10/sc.h b/ed25519/ref10/sc.h
index d32ed2e..81c8594 100644
--- a/ed25519/ref10/sc.h
+++ b/ed25519/ref10/sc.h
@@ -6,8 +6,8 @@ The set of scalars is \Z/l
 where l = 2^252 + 27742317777372353535851937790883648493.
 */
 
-#define sc_reduce crypto_sign_ed25519_ref10_sc_reduce
-#define sc_muladd crypto_sign_ed25519_ref10_sc_muladd
+#define sc_reduce CRYPTO_NAMESPACE(sc_reduce)
+#define sc_muladd CRYPTO_NAMESPACE(sc_muladd)
 
 extern void sc_reduce(unsigned char *);
 extern void sc_muladd(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/test_ed25519.c b/test_ed25519.c
index b87135c..7fe26c6 100644
--- a/test_ed25519.c
+++ b/test_ed25519.c
@@ -6,6 +6,7 @@
 #include "types.h"
 #include "base16.h"
 #include "ed25519/ed25519.h"
+#include "ed25519/ed25519_impl_pre.h"
 #include "testutil.h"
 
 struct pktest {
@@ -60,3 +61,5 @@ int main(void)
 
 	return 0;
 }
+
+#include "ed25519/ed25519_impl_post.h"
diff --git a/worker.c b/worker.c
index 7f8cb03..2a3d2e9 100644
--- a/worker.c
+++ b/worker.c
@@ -18,6 +18,7 @@
 #include "base32.h"
 #include "keccak.h"
 #include "ed25519/ed25519.h"
+#include "ed25519/ed25519_impl_pre.h"
 #include "ioutil.h"
 #include "common.h"
 #include "yaml.h"
@@ -180,7 +181,6 @@ static inline void shiftpk(u8 *dst,const u8 *src,size_t sbits)
 		dst[i] = 0;
 }
 
-#include "worker_slow.inc.h"
 
 
 // in little-endian order, 32 bytes aka 256 bits
@@ -195,7 +195,6 @@ static void addsztoscalar32(u8 *dst,size_t v)
 	}
 }
 
-#include "worker_fast.inc.h"
 
 
 #ifdef PASSPHRASE
@@ -213,7 +212,6 @@ static void reseedright(u8 sk[SECRET_LEN])
 }
 #endif // PASSPHRASE
 
-#include "worker_fast_pass.inc.h"
 
 
 #if !defined(BATCHNUM)
@@ -225,6 +223,15 @@ size_t worker_batch_memuse(void)
 	return (sizeof(ge_p3) + sizeof(fe) + sizeof(bytes32)) * BATCHNUM;
 }
 
+#include "worker_slow.inc.h"
+
+#include "worker_fast.inc.h"
+
+#include "worker_fast_pass.inc.h"
+
 #include "worker_batch.inc.h"
 
 #include "worker_batch_pass.inc.h"
+
+// XXX this is useless here, but will end up somewhere like that when i'll modularize stuff
+#include "ed25519/ed25519_impl_post.h"
diff --git a/worker_impl.inc.h b/worker_impl.inc.h
new file mode 100644
index 0000000..70b786d
--- /dev/null
+++ b/worker_impl.inc.h
@@ -0,0 +1 @@
+// TODO