diff --git a/core/linux-armv8/0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch b/core/linux-aarch64/0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
similarity index 100%
rename from core/linux-armv8/0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
rename to core/linux-aarch64/0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
diff --git a/core/linux-armv8/0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch b/core/linux-aarch64/0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
similarity index 100%
rename from core/linux-armv8/0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
rename to core/linux-aarch64/0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
diff --git a/core/linux-armv8/0003-arm64-acpi-drop-expert-patch.patch b/core/linux-aarch64/0003-arm64-acpi-drop-expert-patch.patch
similarity index 100%
rename from core/linux-armv8/0003-arm64-acpi-drop-expert-patch.patch
rename to core/linux-aarch64/0003-arm64-acpi-drop-expert-patch.patch
diff --git a/core/linux-armv8/0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch b/core/linux-aarch64/0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
similarity index 100%
rename from core/linux-armv8/0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
rename to core/linux-aarch64/0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
diff --git a/core/linux-armv8/0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch b/core/linux-aarch64/0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch
similarity index 100%
rename from core/linux-armv8/0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch
rename to core/linux-aarch64/0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch
diff --git a/core/linux-armv8/0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch b/core/linux-aarch64/0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch
similarity index 100%
rename from core/linux-armv8/0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch
rename to core/linux-aarch64/0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch
diff --git a/core/linux-armv8/0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch b/core/linux-aarch64/0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch
similarity index 100%
rename from core/linux-armv8/0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch
rename to core/linux-aarch64/0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch
diff --git a/core/linux-armv8/PKGBUILD b/core/linux-aarch64/PKGBUILD
similarity index 97%
rename from core/linux-armv8/PKGBUILD
rename to core/linux-aarch64/PKGBUILD
index 0a21ab2ea..df9d1e439 100644
--- a/core/linux-armv8/PKGBUILD
+++ b/core/linux-aarch64/PKGBUILD
@@ -1,12 +1,12 @@
-# ARMv8 multi-platform
+# AArch64 multi-platform
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
 buildarch=8
 
-pkgbase=linux-armv8
+pkgbase=linux-aarch64
 _srcname=linux-4.3
 _kernelname=${pkgbase#linux}
-_desc="ARMv8 multi-platform"
+_desc="AArch64 multi-platform"
 pkgver=4.3.0
 pkgrel=1
 arch=('aarch64')
@@ -33,8 +33,8 @@ md5sums=('58b35794eee3b6d52ce7be39357801e7'
          '1ec8970e2fdba212479eae61cd799a12'
          '1a66e243ed08e3331b2550cd777ef800'
          '634737dc18404f4a05a1fd557dc4839d'
-         '220a53cd10a5952a2c573b34e95edfc1'
-         'c1b17ea11a6c9ca95a26881db1376e8e')
+         'edd9d32052fd7c2d5b9806bbb258435c'
+         'b5ef67d6086e20de7b82265f562f88b1')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -96,6 +96,7 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=${pkgver}")
+  replaces=('linux-armv8')
   conflicts=('linux')
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgname}.install
@@ -153,6 +154,7 @@ _package() {
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
   provides=("linux-headers=${pkgver}")
+  replaces=('linux-armv8-headers')
   conflicts=('linux-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
diff --git a/core/linux-armv8/config b/core/linux-aarch64/config
similarity index 99%
rename from core/linux-armv8/config
rename to core/linux-aarch64/config
index cde68d5ef..148171817 100644
--- a/core/linux-armv8/config
+++ b/core/linux-aarch64/config
@@ -26,7 +26,7 @@ CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=2
+CONFIG_PGTABLE_LEVELS=3
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -382,11 +382,12 @@ CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
-# CONFIG_ARM64_4K_PAGES is not set
-CONFIG_ARM64_64K_PAGES=y
-CONFIG_ARM64_VA_BITS_42=y
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_64K_PAGES is not set
+CONFIG_ARM64_VA_BITS_39=y
+# CONFIG_ARM64_VA_BITS_42 is not set
 # CONFIG_ARM64_VA_BITS_48 is not set
-CONFIG_ARM64_VA_BITS=42
+CONFIG_ARM64_VA_BITS=39
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
@@ -404,6 +405,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -473,6 +475,7 @@ CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# CONFIG_COMPAT is not set
 
 #
 # Power management options
diff --git a/core/linux-armv8/linux-armv8.install b/core/linux-aarch64/linux-aarch64.install
similarity index 97%
rename from core/linux-armv8/linux-armv8.install
rename to core/linux-aarch64/linux-aarch64.install
index bd70b0a1d..0e6c5025b 100644
--- a/core/linux-armv8/linux-armv8.install
+++ b/core/linux-aarch64/linux-aarch64.install
@@ -1,7 +1,7 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
-KERNEL_NAME=-armv8
+KERNEL_NAME=-aarch64
 KERNEL_VERSION=4.3.0-1-ARCH
 
 post_install () {
diff --git a/core/linux-armv8/linux.preset b/core/linux-aarch64/linux.preset
similarity index 78%
rename from core/linux-armv8/linux.preset
rename to core/linux-aarch64/linux.preset
index 24a16e2e7..1153f9007 100644
--- a/core/linux-armv8/linux.preset
+++ b/core/linux-aarch64/linux.preset
@@ -1,7 +1,7 @@
-# mkinitcpio preset file for the 'linux-armv8' package
+# mkinitcpio preset file for the 'linux-aarch64' package
 
 ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="4.2.0-1-ARCH"
+ALL_kver="4.3.0-1-ARCH"
 
 PRESETS=('default' 'fallback')