Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 298ab3dfe055abd231901ff85de7e7c829170ba3)
+++ automake/cfa.m4	(revision a8d4b592d6ba9a45a01127ff6b84417756735aa4)
@@ -66,5 +66,5 @@
 		"x86-64"     ) cannon_arch_name="x64";;
 		"x86_64"     ) cannon_arch_name="x64";;
-		"aarch64"    ) cannon_arch_name="x64";;
+		"aarch64"    ) cannon_arch_name="arm";;
 		"x86"        ) cannon_arch_name="x86";;
 		"i386"       ) cannon_arch_name="x86";;
Index: configure
===================================================================
--- configure	(revision 298ab3dfe055abd231901ff85de7e7c829170ba3)
+++ configure	(revision a8d4b592d6ba9a45a01127ff6b84417756735aa4)
@@ -3445,5 +3445,5 @@
 		"x86-64"     ) cannon_arch_name="x64";;
 		"x86_64"     ) cannon_arch_name="x64";;
-		"aarch64"    ) cannon_arch_name="x64";;
+		"aarch64"    ) cannon_arch_name="arm";;
 		"x86"        ) cannon_arch_name="x86";;
 		"i386"       ) cannon_arch_name="x86";;
@@ -3487,5 +3487,5 @@
 		"x86-64"     ) cannon_arch_name="x64";;
 		"x86_64"     ) cannon_arch_name="x64";;
-		"aarch64"    ) cannon_arch_name="x64";;
+		"aarch64"    ) cannon_arch_name="arm";;
 		"x86"        ) cannon_arch_name="x86";;
 		"i386"       ) cannon_arch_name="x86";;
Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 298ab3dfe055abd231901ff85de7e7c829170ba3)
+++ tests/pybin/settings.py	(revision a8d4b592d6ba9a45a01127ff6b84417756735aa4)
@@ -19,15 +19,15 @@
 class Architecture:
 	KnownArchitectures = {
-		'x64'			: 'x64',
-		'x86-64'		: 'x64',
-		'x86_64'		: 'x64',
-		'aarch64'		: 'x64',
-		'x86'			: 'x86',
+		'x64'		: 'x64',
+		'x86-64'	: 'x64',
+		'x86_64'	: 'x64',
+		'x86'		: 'x86',
+		'aarch64'	: 'arm',
 		'i386'		: 'x86',
 		'i486'		: 'x86',
 		'i686'		: 'x86',
 		'Intel 80386'	: 'x86',
-		'arm'			: 'arm',
-		'ARM'			: 'arm',
+		'arm'		: 'arm',
+		'ARM'		: 'arm',
 	}