diff --git a/mix_vbp/Android.mk b/mix_vbp/Android.mk
index 3899789..3df2e0a 100644
--- a/mix_vbp/Android.mk
+++ b/mix_vbp/Android.mk
@@ -9,10 +9,10 @@
 include $(VENDORS_INTEL_MRST_MIXVBP_ROOT)/viddec_fw/fw/codecs/vc1/parser/Android.mk
 
 # Add source codes for Merrifield
-MERRIFIELD_PRODUCT := \
+MERRIFIELD_DEVICE := \
         mrfl_vp \
         mrfl_hvp \
         mrfl_sle
-ifneq ($(filter $(TARGET_PRODUCT),$(MERRIFIELD_PRODUCT)),)
+ifneq ($(filter $(REF_DEVICE_NAME),$(MERRIFIELD_DEVICE)),)
 include $(VENDORS_INTEL_MRST_MIXVBP_ROOT)/viddec_fw/fw/codecs/vp8/parser/Android.mk
 endif
diff --git a/mix_vbp/viddec_fw/fw/parser/Android.mk b/mix_vbp/viddec_fw/fw/parser/Android.mk
index b578ec2..6e403da 100644
--- a/mix_vbp/viddec_fw/fw/parser/Android.mk
+++ b/mix_vbp/viddec_fw/fw/parser/Android.mk
@@ -45,11 +45,11 @@
 LOCAL_SHARED_LIBRARIES += liblog
 endif
 
-MERRIFIELD_PRODUCT := \
+MERRIFIELD_DEVICE := \
         mrfl_vp \
         mrfl_hvp \
         mrfl_sle
-ifneq ($(filter $(TARGET_PRODUCT),$(MERRIFIELD_PRODUCT)),)
+ifneq ($(filter $(REF_DEVICE_NAME),$(MERRIFIELD_DEVICE)),)
 LOCAL_SRC_FILES += vbp_vp8_parser.c
 LOCAL_C_INCLUDES += $(VENDORS_INTEL_MRST_MIXVBP_ROOT)/viddec_fw/fw/codecs/vp8/include
 LOCAL_CFLAGS += -DUSE_HW_VP8
diff --git a/videodecoder/Android.mk b/videodecoder/Android.mk
index 5bde2ce..9c335f3 100644
--- a/videodecoder/Android.mk
+++ b/videodecoder/Android.mk
@@ -45,11 +45,11 @@
 LOCAL_MODULE := libva_videodecoder
 
 # Add source codes for Merrifield
-MERRIFIELD_PRODUCT := \
+MERRIFIELD_DEVICE := \
         mrfl_vp \
         mrfl_hvp \
         mrfl_sle
-ifneq ($(filter $(TARGET_PRODUCT),$(MERRIFIELD_PRODUCT)),)
+ifneq ($(filter $(REF_DEVICE_NAME),$(MERRIFIELD_DEVICE)),)
 LOCAL_SRC_FILES += VideoDecoderVP8.cpp
 LOCAL_CFLAGS += -DUSE_HW_VP8
 endif