diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 91eaf86c18..832625a457 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -180,7 +180,7 @@ const
       'bsd', 'linux' // see GetDefaultSrcOS2ForTargetOS
     );
   FPCProcessorNames: array[1..12] of shortstring =(
-      'a64',
+      'aarch64',
       'arm',
       'avr',
       'i386',
@@ -3002,8 +3002,8 @@ begin
     Result:=Result+'x64'
   else if SysUtils.CompareText(TargetCPU,'ia64')=0 then
     Result:=Result+'ia64'
-  else if SysUtils.CompareText(TargetCPU,'a64')=0 then
-    Result:=Result+'a64'
+  else if SysUtils.CompareText(TargetCPU,'aarch64')=0 then
+    Result:=Result+'aarch64'
   else
     Result:='fpc';
   Result:=Result+ExeExt;
@@ -3089,7 +3089,7 @@ begin
     'x86_64' : Intel_x86_64;
     'mipsel','mips' : Mips;
     'jvm'    : ;
-    'a64'    : ;
+    'aarch64': ;
   end;
 end;
 
diff --git a/components/codetools/ppuparser.pas b/components/codetools/ppuparser.pas
index c05e33b7a0..3617222cb4 100644
--- a/components/codetools/ppuparser.pas
+++ b/components/codetools/ppuparser.pas
@@ -198,7 +198,7 @@ const
      'mipsel',
      'jvm',
      'i8086',
-     'a64'
+     'aarch64'
      );
 
 // from ppu.pas
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 99fb7edefd..02f159192f 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -1086,7 +1086,7 @@ begin
   with TargetCPUComboBox do begin
     with Items do begin
       Add(''); //('+rsiwpDefault+')');
-      Add('a64');
+      Add('aarch64');
       Add('arm');
       Add('i386');
       Add('m68k');