diff --git a/a30s/dtbo/Android.mk b/a30s/dtbo/Android.mk
index e04cb76..da9d9d9 100644
--- a/a30s/dtbo/Android.mk
+++ b/a30s/dtbo/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_DEVICE),a40)
+ifeq ($(TARGET_DEVICE),a30s)
 LOCAL_PATH := $(call my-dir)
 $(call add-radio-file,eureka_dtbo.img)
 endif
diff --git a/a30s/full_a30s.mk b/a30s/full_a30s.mk
index bdaef7a..15b1507 100644
--- a/a30s/full_a30s.mk
+++ b/a30s/full_a30s.mk
@@ -8,7 +8,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/samsung/a40/device.mk)
+$(call inherit-product, device/samsung/a30s/device.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := a30s
diff --git a/universal7885-common/Android.mk b/universal7885-common/Android.mk
index 96bb25f..fa2d654 100644
--- a/universal7885-common/Android.mk
+++ b/universal7885-common/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter a10 a20 a20e a30 a40, $(TARGET_DEVICE)),)
+ifneq ($(filter a10 a20 a20e a30 a30s a40, $(TARGET_DEVICE)),)
 
   subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
   $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))