diff --git a/x86/aes-decrypt.asm b/x86/aes-decrypt.asm
index a56a5fa0be0f0ef45e287f9eee01f87f14eb182f..76590884ac7eef0d68a5aaf980f0ed5d5712b1c8 100644
--- a/x86/aes-decrypt.asm
+++ b/x86/aes-decrypt.asm
@@ -90,16 +90,16 @@ aes_decrypt:
 
 	C last round
 
-	AES_LAST_ROUND(a,b,c,d)
+	AES_FINAL_ROUND(a,b,c,d)
 	pushl	%edi
 
-	AES_LAST_ROUND(b,c,d,a)
+	AES_FINAL_ROUND(b,c,d,a)
 	pushl	%edi
 
-	AES_LAST_ROUND(c,d,a,b)
+	AES_FINAL_ROUND(c,d,a,b)
 	pushl	%edi
 
-	AES_LAST_ROUND(d,a,b,c)
+	AES_FINAL_ROUND(d,a,b,c)
 	
 	movl	%edi,%edx
 	popl	%ecx
diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index 576e5691ec83cd8551383d4a5888fe898c0c2f5b..f8487c31ee10bc96c444e9f0f5e94e304e067c65 100644
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -95,16 +95,16 @@ aes_encrypt:
 
 	C last round
 
-	AES_LAST_ROUND(a,b,c,d)
+	AES_FINAL_ROUND(a,b,c,d)
 	pushl	%edi
 
-	AES_LAST_ROUND(b,c,d,a)
+	AES_FINAL_ROUND(b,c,d,a)
 	pushl	%edi
 
-	AES_LAST_ROUND(c,d,a,b)
+	AES_FINAL_ROUND(c,d,a,b)
 	pushl	%edi
 
-	AES_LAST_ROUND(d,a,b,c)
+	AES_FINAL_ROUND(d,a,b,c)
 	movl	%edi,%edx
 	
 	popl	%ecx
diff --git a/x86/machine.m4 b/x86/machine.m4
index 91cc3eb92545a6e54114ec36f4838ebf5ac52b1e..dd87b33c4c39948b826657e47dbd26eafb0de876 100644
--- a/x86/machine.m4
+++ b/x86/machine.m4
@@ -50,10 +50,10 @@ define(<AES_ROUND>, <
 	andl	<$>0x000003fc,%esi
 	xorl	AES_TABLE3 + $1 (%esi),%edi>)dnl
 
-dnl AES_LAST_ROUND(a, b, c, d)
+dnl AES_FINAL_ROUND(a, b, c, d)
 dnl Computes one word of the final round. Leaves result in %edi.
 dnl Note that we have to quote $ in constants.
-define(<AES_LAST_ROUND>, <
+define(<AES_FINAL_ROUND>, <
 	C FIXME: Perform substitution on least significant byte here,
 	C to save work later.
 	movl	%e<>$1<>x,%edi