diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b907a84..fc615799 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ add_definitions(-DRDKB_EMU)
 endif (BUILD_EMULATOR)
 
 if (BUILD_BANANAPI_R4)
-add_definitions(-DPLATFORM_BANANAPI_R4)
+add_definitions(-D_PLATFORM_BANANAPI_R4_)
 endif (BUILD_BANANAPI_R4)
 
 if (FEATURE_SUPPORT_WEBCONFIG)
diff --git a/source/broadband/include/webpa_internal.h b/source/broadband/include/webpa_internal.h
index 61707ae7..5be07180 100644
--- a/source/broadband/include/webpa_internal.h
+++ b/source/broadband/include/webpa_internal.h
@@ -81,7 +81,7 @@
 #define DEVICE_MAC                   "Device.DPoE.Mac_address"
 #elif defined(PLATFORM_RASPBERRYPI)
 #define DEVICE_MAC                   "Device.Ethernet.Interface.5.MACAddress"
-#elif defined(RDKB_EMU) || defined(PLATFORM_BANANAPI_R4)
+#elif defined(RDKB_EMU) || defined(_PLATFORM_BANANAPI_R4_)
 #define DEVICE_MAC                   "Device.DeviceInfo.X_COMCAST-COM_WAN_MAC"
 #elif defined(_HUB4_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_)
 #define DEVICE_MAC                   "Device.DeviceInfo.X_COMCAST-COM_WAN_MAC"
diff --git a/source/broadband/webpa_internal.c b/source/broadband/webpa_internal.c
index 24099341..dc7e6cc0 100644
--- a/source/broadband/webpa_internal.c
+++ b/source/broadband/webpa_internal.c
@@ -199,7 +199,7 @@ int waitForOperationalReadyCondition()
 	{
 		return EPON_FAILED;
 	}
-#elif !defined(PLATFORM_RASPBERRYPI) && !defined(RDKB_EMU) && !defined(PLATFORM_BANANAPI_R4)
+#elif !defined(PLATFORM_RASPBERRYPI) && !defined(RDKB_EMU) && !defined(_PLATFORM_BANANAPI_R4_)
     if(check_ethernet_wan_status() != WDMP_SUCCESS)
 	{
 #if !defined(_SKY_HUB_COMMON_PRODUCT_REQ_)