diff --git a/.github/labeler.yml b/.github/labeler.yml
index 410b677bdcf..10d52f1589d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -58,8 +58,8 @@
   - "arch/arm/**/*"
   - "include/arch/arm/**/*"
 "area: ARM_64":
-  - "arch/arm/core/aarch64/**/*"
-  - "include/arch/arm/aarch64/**/*"
+  - "arch/arm64/**/*"
+  - "include/arch/arm64/**/*"
 "area: NIOS2":
   - "arch/nios2/**/*"
   - "include/arch/nios2/**/*"
diff --git a/CODEOWNERS b/CODEOWNERS
index fe90256e430..ea1307fc16c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -21,10 +21,9 @@
 /arch/arc/                                @abrodkin @ruuddw @evgeniy-paltsev
 /arch/arm/                                @MaureenHelm @galak @ioannisg
 /arch/arm/core/aarch32/cortex_m/cmse/     @ioannisg
-/arch/arm/core/aarch64/                   @carlocaione
 /arch/arm/include/aarch32/cortex_m/cmse.h @ioannisg
-/arch/arm/include/aarch64/                @carlocaione
 /arch/arm/core/aarch32/cortex_a_r/        @MaureenHelm @galak @ioannisg @bbolen @stephanosio
+/arch/arm64/                              @carlocaione
 /arch/common/                             @ioannisg @andyross
 /soc/arc/snps_*/                          @abrodkin @ruuddw @evgeniy-paltsev
 /soc/nios2/                               @nashif
@@ -44,7 +43,6 @@
 /soc/arm/nordic_nrf/                      @ioannisg
 /soc/arm/nuvoton/                         @ssekar15
 /soc/arm/nuvoton_npcx/                    @MulinChao @WealianLiao @ChiHuaL
-/soc/arm/qemu_cortex_a53/                 @carlocaione
 /soc/arm/quicklogic_eos_s3/               @kowalewskijan @kgugala
 /soc/arm/silabs_exx32/efm32pg1b/          @rdmeneze
 /soc/arm/silabs_exx32/efr32mg21/          @l-alfred
@@ -56,6 +54,10 @@
 /soc/arm/ti_simplelink/msp432p4xx/        @Mani-Sadhasivam
 /soc/arm/xilinx_zynqmp/                   @stephanosio
 /soc/xtensa/intel_s1000/                  @sathishkuttan @dcpleung
+/soc/arm64/                               @carlocaione
+/soc/arm64/qemu_cortex_a53/               @carlocaione
+/soc/arm64/bcm_vk/                        @abhishek-brcm
+/soc/arm64/xenvm/                         @lorc
 /arch/x86/                                @jhedberg @nashif @jenmwms @aasthagr
 /arch/nios2/                              @nashif
 /arch/posix/                              @aescolar @daor-oti
@@ -105,7 +107,6 @@
 /boards/arm/nucleo*/                      @erwango @ABOSTM @FRASTM
 /boards/arm/nucleo_f401re/                @idlethread
 /boards/arm/nuvoton_pfm_m487/             @ssekar15
-/boards/arm/qemu_cortex_a53/              @carlocaione
 /boards/arm/qemu_cortex_r*/               @stephanosio
 /boards/arm/qemu_cortex_m*/               @ioannisg
 /boards/arm/quick_feather/                @kowalewskijan @kgugala
@@ -143,6 +144,9 @@
 /boards/xtensa/intel_s1000_crb/           @sathishkuttan @dcpleung
 /boards/xtensa/odroid_go/                 @ydamigos
 /boards/sparc/                            @martin-aberg
+/boards/arm64/qemu_cortex_a53/            @carlocaione
+/boards/arm64/bcm958402m2_a72/            @abhishek-brcm
+/boards/arm64/xenvm/                      @lorc
 # All cmake related files
 /cmake/                                   @tejlmand @nashif
 /cmake/*/arcmwdt/                         @abrodkin @evgeniy-paltsev @tejlmand
@@ -324,7 +328,7 @@
 /dts/arm/broadcom/                        @sbranden
 /dts/arm/cypress/                         @nandojve
 /dts/arm/infineon/                        @parthitce
-/dts/arm/qemu-virt/                       @carlocaione
+/dts/arm64/                               @carlocaione
 /dts/arm/quicklogic/                      @wtatarski @kowalewskijan @kgugala
 /dts/arm/st/                              @erwango
 /dts/arm/ti/cc13?2*                       @bwitherspoon
@@ -352,7 +356,6 @@
 /dts/riscv/riscv32-litex-vexriscv.dtsi    @mateusz-holenko @kgugala @pgielda
 /dts/arm/armv*m.dtsi                      @galak @ioannisg
 /dts/arm/armv7-r.dtsi                     @bbolen @stephanosio
-/dts/arm/armv8-a.dtsi                     @carlocaione
 /dts/arm/xilinx/                          @bbolen @stephanosio
 /dts/x86/                                 @jhedberg
 /dts/xtensa/xtensa.dtsi                   @ydamigos
@@ -410,8 +413,7 @@
 /include/arch/arc/v2/irq.h                @abrodkin @ruuddw @evgeniy-paltsev
 /include/arch/arm/aarch32/                @MaureenHelm @galak @ioannisg
 /include/arch/arm/aarch32/cortex_a_r/     @stephanosio
-/include/arch/arm/aarch64/                @carlocaione
-/include/arch/arm/arm-smccc.h             @carlocaione
+/include/arch/arm64/                      @carlocaione
 /include/arch/arm/aarch32/irq.h           @carlocaione
 /include/arch/nios2/                      @nashif
 /include/arch/nios2/arch.h                @nashif
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 681d763ce14..3d9433c4b03 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -153,9 +153,12 @@ ARM64 arch:
         - npitre
         - ioannisg
     files:
-        - arch/arm/core/aarch64/
-        - include/arch/arm/aarch64/
+        - arch/arm64/
+        - include/arch/arm64/
         - tests/arch/arm64/
+        - soc/arm64/qemu_cortex_a53/
+        - boards/arm64/qemu_cortex_a53/
+        - dts/arm64/
     labels:
         - "area: ARM64"
 
diff --git a/arch/arm64/include/exc.h b/arch/arm64/include/exc.h
index 5d07cfc86f2..d182544a6ed 100644
--- a/arch/arm64/include/exc.h
+++ b/arch/arm64/include/exc.h
@@ -11,8 +11,8 @@
  * Exception/interrupt context helpers.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_EXC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_EXC_H_
+#ifndef ZEPHYR_ARCH_ARM64_INCLUDE_EXC_H_
+#define ZEPHYR_ARCH_ARM64_INCLUDE_EXC_H_
 
 #include <arch/cpu.h>
 
@@ -46,4 +46,4 @@ extern void z_arm64_call_svc(void *switch_to, void **switched_from);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_EXC_H_ */
+#endif /* ZEPHYR_ARCH_ARM64_INCLUDE_EXC_H_ */
diff --git a/arch/arm64/include/kernel_arch_data.h b/arch/arm64/include/kernel_arch_data.h
index 0669ef9baaf..12b20ae391b 100644
--- a/arch/arm64/include/kernel_arch_data.h
+++ b/arch/arm64/include/kernel_arch_data.h
@@ -17,8 +17,8 @@
  * in the offsets.o module.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_
+#ifndef ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #include <toolchain.h>
 #include <linker/sections.h>
@@ -45,4 +45,4 @@ typedef struct __basic_sf _basic_sf_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_ */
+#endif /* ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/arm64/include/kernel_arch_func.h b/arch/arm64/include/kernel_arch_func.h
index fc06999a0ac..462eaece62b 100644
--- a/arch/arm64/include/kernel_arch_func.h
+++ b/arch/arm64/include/kernel_arch_func.h
@@ -17,8 +17,8 @@
  * in the offsets.o module.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_KERNEL_ARCH_FUNC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_KERNEL_ARCH_FUNC_H_
+#ifndef ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #include <kernel_arch_data.h>
 
@@ -49,4 +49,4 @@ extern void z_arm64_set_ttbr0(uintptr_t ttbr0);
 }
 #endif
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_KERNEL_ARCH_FUNC_H_ */
+#endif /* ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/arm64/include/offsets_short_arch.h b/arch/arm64/include/offsets_short_arch.h
index 11bbb1fcd05..f8b49a4cff0 100644
--- a/arch/arm64/include/offsets_short_arch.h
+++ b/arch/arm64/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_OFFSETS_SHORT_ARCH_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_OFFSETS_SHORT_ARCH_H_
+#ifndef ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -14,4 +14,4 @@
 	(___thread_t_arch_OFFSET + ___thread_arch_t_priv_stack_start_OFFSET)
 #endif
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH64_OFFSETS_SHORT_ARCH_H_ */
+#endif /* ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/boards/arm64/index.rst b/boards/arm64/index.rst
new file mode 100644
index 00000000000..b922c32595a
--- /dev/null
+++ b/boards/arm64/index.rst
@@ -0,0 +1,10 @@
+.. _boards-arm64:
+
+ARM64 Boards
+############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/index.rst b/boards/index.rst
index c1a355f697d..8475c2a137e 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -15,6 +15,7 @@ under :zephyr_file:`doc/templates/board.tmpl`
 
    x86/index.rst
    arm/index.rst
+   arm64/index.rst
    arc/index.rst
    nios2/index.rst
    xtensa/index.rst
diff --git a/include/arch/arm64/arch.h b/include/arch/arm64/arch.h
index bc8789b3edd..5c4d8e972dc 100644
--- a/include/arch/arm64/arch.h
+++ b/include/arch/arm64/arch.h
@@ -10,11 +10,11 @@
  *
  * This header contains the ARM64 specific kernel interface.  It is
  * included by the kernel interface architecture-abstraction header
- * (include/arm/aarch64/cpu.h)
+ * (include/arm64/cpu.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_
 
 /* Add include for DTS generated information */
 #include <devicetree.h>
@@ -49,7 +49,7 @@ extern "C" {
  * The macros are to be stored in k_mem_partition_attr_t
  * objects. The format of a k_mem_partition_attr_t object
  * is an uint32_t composed by permission and attribute flags
- * located in include/arch/arm/aarch64/arm_mmu.h
+ * located in include/arch/arm64/arm_mmu.h
  */
 
 /* Read-Write access permission attributes */
@@ -82,4 +82,4 @@ struct arch_mem_domain {
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_ */
diff --git a/include/arch/arm64/arch_inlines.h b/include/arch/arm64/arch_inlines.h
index ef3a4a7a309..ae97c52ee88 100644
--- a/include/arch/arm64/arch_inlines.h
+++ b/include/arch/arm64/arch_inlines.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H
 
 #ifndef _ASMLANGUAGE
 
@@ -28,4 +28,4 @@ static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
 }
 
 #endif /* !_ASMLANGUAGE */
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H */
diff --git a/include/arch/arm64/arm-smccc.h b/include/arch/arm64/arm-smccc.h
index 6ede4c11d69..611ad6c7add 100644
--- a/include/arch/arm64/arm-smccc.h
+++ b/include/arch/arm64/arm-smccc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_
 
 /*
  * Result from SMC/HVC call
@@ -56,4 +56,4 @@ void arm_smccc_smc(unsigned long a0, unsigned long a1,
 		   unsigned long a6, unsigned long a7,
 		   struct arm_smccc_res *res);
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_ */
diff --git a/include/arch/arm64/arm_mmu.h b/include/arch/arm64/arm_mmu.h
index 9e86bccac9f..4511eef1de1 100644
--- a/include/arch/arm64/arm_mmu.h
+++ b/include/arch/arm64/arm_mmu.h
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_
 
 /* Following Memory types supported through MAIR encodings can be passed
  * by user through "attrs"(attributes) field of specified memory region.
@@ -201,4 +201,4 @@ void z_arm64_swap_ptables(struct k_thread *thread);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_ */
diff --git a/include/arch/arm64/asm_inline.h b/include/arch/arm64/asm_inline.h
index 1861113120e..4ccba1924d1 100644
--- a/include/arch/arm64/asm_inline.h
+++ b/include/arch/arm64/asm_inline.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -18,4 +18,4 @@
 #include <arch/arm/asm_inline_other.h>
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_ */
diff --git a/include/arch/arm64/asm_inline_gcc.h b/include/arch/arm64/asm_inline_gcc.h
index 0ffd47f6d06..47b2dc4dead 100644
--- a/include/arch/arm64/asm_inline_gcc.h
+++ b/include/arch/arm64/asm_inline_gcc.h
@@ -6,8 +6,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_
 
 /*
  * The file must not be included directly
@@ -54,4 +54,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/arm64/cpu.h b/include/arch/arm64/cpu.h
index 0705f34f2bf..197bb8d82f9 100644
--- a/include/arch/arm64/cpu.h
+++ b/include/arch/arm64/cpu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
 
 #include <sys/util.h>
 
@@ -206,4 +206,4 @@
 #define L1_CACHE_BYTES		BIT(L1_CACHE_SHIFT)
 #define ARM64_CPU_INIT_SIZE	L1_CACHE_BYTES
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_ */
diff --git a/include/arch/arm64/error.h b/include/arch/arm64/error.h
index 471a45831ee..c7f0f4a495b 100644
--- a/include/arch/arm64/error.h
+++ b/include/arch/arm64/error.h
@@ -11,8 +11,8 @@
  * ARM AArch64-specific kernel error handling interface. Included by arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
 
 #include <arch/arm64/syscall.h>
 #include <arch/arm64/exc.h>
@@ -37,4 +37,4 @@ do {									\
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_ */
diff --git a/include/arch/arm64/exc.h b/include/arch/arm64/exc.h
index 04e504049c2..4dad90b51c5 100644
--- a/include/arch/arm64/exc.h
+++ b/include/arch/arm64/exc.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel exception handling interface. Included by arm64/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_
 
 /* for assembler, only works with constants */
 
@@ -60,4 +60,4 @@ typedef struct __esf z_arch_esf_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_ */
diff --git a/include/arch/arm64/irq.h b/include/arch/arm64/irq.h
index ebc3f806a78..e780d323f5a 100644
--- a/include/arch/arm64/irq.h
+++ b/include/arch/arm64/irq.h
@@ -9,11 +9,11 @@
  * @brief Cortex-A public interrupt handling
  *
  * ARM64-specific kernel interrupt handling interface.
- * Included by arm/aarch64/arch.h.
+ * Included by arm64/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
 
 #include <irq.h>
 #include <sw_isr_table.h>
@@ -111,4 +111,4 @@ extern void _isr_wrapper(void);
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_ */
diff --git a/include/arch/arm64/lib_helpers.h b/include/arch/arm64/lib_helpers.h
index 6c3dc1a9d53..f66ba7fbeba 100644
--- a/include/arch/arm64/lib_helpers.h
+++ b/include/arch/arm64/lib_helpers.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -183,4 +183,4 @@ static inline bool is_in_secure_state(void)
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_ */
diff --git a/include/arch/arm64/macro.inc b/include/arch/arm64/macro.inc
index d25ebd8b540..4fd8da4a639 100644
--- a/include/arch/arm64/macro.inc
+++ b/include/arch/arm64/macro.inc
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_
 
 #ifdef _ASMLANGUAGE
 
@@ -44,4 +44,4 @@
 .endm
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_ */
diff --git a/include/arch/arm64/misc.h b/include/arch/arm64/misc.h
index 0fe9a230995..3e9f93b638f 100644
--- a/include/arch/arm64/misc.h
+++ b/include/arch/arm64/misc.h
@@ -9,11 +9,11 @@
  * @brief Cortex-A public kernel miscellaneous
  *
  * ARM64-specific kernel miscellaneous interface. Included by
- * arm/aarch64/arch.h.
+ * arm64/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,4 +38,4 @@ static ALWAYS_INLINE void arch_nop(void)
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_ */
diff --git a/include/arch/arm64/sys_io.h b/include/arch/arm64/sys_io.h
index 11526054437..346af3fabca 100644
--- a/include/arch/arm64/sys_io.h
+++ b/include/arch/arm64/sys_io.h
@@ -9,8 +9,8 @@
  * gcc builtins)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -87,4 +87,4 @@ static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_ */
diff --git a/include/arch/arm64/syscall.h b/include/arch/arm64/syscall.h
index 176f55dc28f..0c8d561cf5c 100644
--- a/include/arch/arm64/syscall.h
+++ b/include/arch/arm64/syscall.h
@@ -10,11 +10,11 @@
  *
  * This header contains the ARM64 specific syscall interface.  It is
  * included by the syscall interface architecture-abstraction header
- * (include/arch/aarch64/syscall.h)
+ * (include/arch64/syscall.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_AARCH64_ARM_SYSCALL_H_
-#define ZEPHYR_INCLUDE_ARCH_AARCH64_ARM_SYSCALL_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_
 
 #define _SVC_CALL_CONTEXT_SWITCH	0
 #define _SVC_CALL_IRQ_OFFLOAD		1
@@ -179,4 +179,4 @@ static inline bool arch_is_user_context(void)
 #endif /* _ASMLANGUAGE */
 #endif /* CONFIG_USERSPACE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYSCALL_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_ */
diff --git a/include/arch/arm64/thread.h b/include/arch/arm64/thread.h
index 9ae22c23be1..44d6e7b5f31 100644
--- a/include/arch/arm64/thread.h
+++ b/include/arch/arm64/thread.h
@@ -16,8 +16,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -50,4 +50,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_ */
diff --git a/include/arch/arm64/thread_stack.h b/include/arch/arm64/thread_stack.h
index e008bb53f28..317a5c20e15 100644
--- a/include/arch/arm64/thread_stack.h
+++ b/include/arch/arm64/thread_stack.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_
 
 #define ARCH_STACK_PTR_ALIGN			16
 
@@ -55,4 +55,4 @@ struct z_arm64_thread_stack_header {
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_ */
diff --git a/include/arch/arm64/timer.h b/include/arch/arm64/timer.h
index 9023e1747ba..904dcf289fc 100644
--- a/include/arch/arm64/timer.h
+++ b/include/arch/arm64/timer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -70,4 +70,4 @@ static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_ */