diff --git a/x86/aes-decrypt.asm b/x86/aes-decrypt.asm
index d36134d209b75d582776825eae3593b82e695f6c..f96cde9f971ac1a25963f1eaa5a17631c5d0fa56 100644
--- a/x86/aes-decrypt.asm
+++ b/x86/aes-decrypt.asm
@@ -59,16 +59,16 @@ nettle_aes_decrypt:
 	C In these patterns, note that each row, like
 	C "a,d,c,b" corresponds to one *column* of the 
 	C array _aes_decrypt_table.idx.
-	AES_ROUND(_aes_decrypt_table,a,d,c,b)
+	AES_ROUND(_nettle_aes_decrypt_table,a,d,c,b)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_aes_decrypt_table,b,a,d,c)
+	AES_ROUND(_nettle_aes_decrypt_table,b,a,d,c)
 	pushl	%edi
 
-	AES_ROUND(_aes_decrypt_table,c,b,a,d)
+	AES_ROUND(_nettle_aes_decrypt_table,c,b,a,d)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_aes_decrypt_table,d,c,b,a)
+	AES_ROUND(_nettle_aes_decrypt_table,d,c,b,a)
 
 	movl	%edi,%edx
 	popl	%ecx
@@ -106,7 +106,7 @@ nettle_aes_decrypt:
 	C inverse S-box substitution
 	mov	$4,%edi
 .Lsubst:
-	AES_SUBST_BYTE(_aes_decrypt_table)
+	AES_SUBST_BYTE(_nettle_aes_decrypt_table)
 
 	decl	%edi
 	jnz	.Lsubst
diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index 3bd171e8dc63c9836446a19d9ebd5b0f4fde478a..e946a1aaf1f52b3bc90c75b72f2a82bda54474b0 100644
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -67,16 +67,16 @@ nettle_aes_encrypt:
 .Lround_loop:
 	pushl	%esi		C  save this first: we'll clobber it later
 
-	AES_ROUND(_aes_encrypt_table,a,b,c,d)
+	AES_ROUND(_nettle_aes_encrypt_table,a,b,c,d)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_aes_encrypt_table,b,c,d,a)
+	AES_ROUND(_nettle_aes_encrypt_table,b,c,d,a)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_aes_encrypt_table,c,d,a,b)
+	AES_ROUND(_nettle_aes_encrypt_table,c,d,a,b)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_aes_encrypt_table,d,a,b,c)
+	AES_ROUND(_nettle_aes_encrypt_table,d,a,b,c)
 	
 	movl	%edi,%edx
 	popl	%ecx
@@ -114,7 +114,7 @@ nettle_aes_encrypt:
 	C S-box substitution
 	mov	$4,%edi
 .Lsubst:
-	AES_SUBST_BYTE(_aes_encrypt_table)
+	AES_SUBST_BYTE(_nettle_aes_encrypt_table)
 
 	decl	%edi
 	jnz	.Lsubst