diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index b1a0250..b837310 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -5,4 +5,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_ferrarri.mk
+    $(LOCAL_DIR)/lineage_ferrari.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index df18350..f1d1edf 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,7 +7,7 @@
 # Include the common OEM chipset BoardConfig.
 include device/oneplus/sm8450-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/realme/ferrarri
+DEVICE_PATH := device/realme/ferrari
 
 # DTB
 TARGET_KERNEL_CONFIG += vendor/oplus/ferrari.config
@@ -25,4 +25,4 @@ TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 103
 
 # Include the proprietary files BoardConfig.
-include vendor/realme/ferrarri/BoardConfigVendor.mk
+include vendor/realme/ferrari/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 638d73f..d4d23f2 100644
--- a/device.mk
+++ b/device.mk
@@ -66,4 +66,4 @@ PRODUCT_SOONG_NAMESPACES += \
 $(call inherit-product, device/oneplus/sm8450-common/common.mk)
 
 # Inherit from the proprietary files makefile.
-$(call inherit-product, vendor/realme/ferrarri/ferrarri-vendor.mk)
+$(call inherit-product, vendor/realme/ferrari/ferrari-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 8089030..a43ca1c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,7 +14,7 @@ fi
 
 set -e
 
-export DEVICE=ferrarri
+export DEVICE=ferrari
 export DEVICE_COMMON=sm8450-common
 export VENDOR=realme
 export VENDOR_COMMON=oneplus
diff --git a/lineage_ferrarri.mk b/lineage_ferrari.mk
similarity index 88%
rename from lineage_ferrarri.mk
rename to lineage_ferrari.mk
index e9b8349..0bc4c2b 100644
--- a/lineage_ferrarri.mk
+++ b/lineage_ferrari.mk
@@ -9,13 +9,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from ferrarri device
-$(call inherit-product, device/realme/ferrarri/device.mk)
+$(call inherit-product, device/realme/ferrari/device.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_ferrarri
-PRODUCT_DEVICE := ferrarri
+PRODUCT_NAME := lineage_ferrari
+PRODUCT_DEVICE := ferrari
 PRODUCT_MANUFACTURER := realme
 PRODUCT_BRAND := realme
 PRODUCT_MODEL := RMX3301
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 9292536..5e488e4 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -6,9 +6,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
+if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+    return
+fi
+
 set -e
 
-export DEVICE=ferrarri
+export DEVICE=ferrari
 export DEVICE_COMMON=sm8450-common
 export VENDOR=realme
 export VENDOR_COMMON=oneplus