diff --git a/duoqin/duoqin/BoardConfig.mk b/duoqin/duoqin/BoardConfig.mk
index 9d50d08..a95fc77 100644
--- a/duoqin/duoqin/BoardConfig.mk
+++ b/duoqin/duoqin/BoardConfig.mk
@@ -22,10 +22,10 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
 BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 
 
-TARGET_SYSTEM_PROP := device/nehemiah/wephone/system.prop $(TARGET_SYSTEM_PROP)
+TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
 else
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-endif
\ No newline at end of file
+endif
diff --git a/duoqin/duoqin_f21pro.mk b/duoqin/duoqin_f21pro.mk
index acb702a..f76aa53 100644
--- a/duoqin/duoqin_f21pro.mk
+++ b/duoqin/duoqin_f21pro.mk
@@ -27,12 +27,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
 PRODUCT_NAME := duoqin_f21pro
 PRODUCT_DEVICE := duoqin
 PRODUCT_BRAND := generic
-PRODUCT_MODEL := F21pro - wePhone
+PRODUCT_MODEL := Duoqin F21pro - wePhone
 
 # This is for a device
 PRODUCT_CHARACTERISTICS := device
 
-PRODUCT_PACKAGE_OVERLAYS += device/nehemiah/wephone/overlay
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/duoqin/overlay
 
 PRODUCT_COPY_FILES += \
 	device/wephone/duoqin/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
@@ -43,12 +43,13 @@ PRODUCT_PACKAGES += \
 	BromiteSystemWebView \
 	Conversations \
 	Davx5 \
-	Etar \
-	ExactCalculator \
 	DeskClock \
+	Etar \
 	FDroid \
 	Linphone \
 	Nextcloud \
+	NextcloudNotes \
+	OpenCalc \
 	Wireguard
 
 PRODUCT_PACKAGES -= \