diff --git a/BoardConfig.mk b/BoardConfig.mk
index dc610ba..672fe4a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ## Inherit from the common tree
-include device/samsung/exynos9820-common/BoardConfigCommon.mk
+include device/samsung/exynos9820-common/BoardConfig9820.mk
 
 ## Inherit from the proprietary configuration
 include vendor/samsung/beyondx/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 9bb86d1..94cfede 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 # Inherit from the common tree
-$(call inherit-product, device/samsung/exynos9820-common/common.mk)
+$(call inherit-product, device/samsung/exynos9820-common/exynos9820.mk)
 
 # Inherit proprietary files
 $(call inherit-product, vendor/samsung/beyondx/beyondx-vendor.mk)