diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index bf9b211887..6b5bab3101 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -2416,24 +2416,24 @@ static void dp_hw_link_desc_pool_cleanup(struct dp_soc *soc)
 
 #ifdef IPA_OFFLOAD
 #define REO_DST_RING_SIZE_QCA6290 1023
-#ifndef QCA_WIFI_QCA8074_VP
+#ifndef CONFIG_WIFI_EMULATION_WIFI_3_0
 #define REO_DST_RING_SIZE_QCA8074 1023
 #define REO_DST_RING_SIZE_QCN9000 2048
 #else
 #define REO_DST_RING_SIZE_QCA8074 8
 #define REO_DST_RING_SIZE_QCN9000 8
-#endif /* QCA_WIFI_QCA8074_VP */
+#endif /* CONFIG_WIFI_EMULATION_WIFI_3_0 */
 
 #else
 
 #define REO_DST_RING_SIZE_QCA6290 1024
-#ifndef QCA_WIFI_QCA8074_VP
+#ifndef CONFIG_WIFI_EMULATION_WIFI_3_0
 #define REO_DST_RING_SIZE_QCA8074 2048
 #define REO_DST_RING_SIZE_QCN9000 2048
 #else
 #define REO_DST_RING_SIZE_QCA8074 8
 #define REO_DST_RING_SIZE_QCN9000 8
-#endif /* QCA_WIFI_QCA8074_VP */
+#endif /* CONFIG_WIFI_EMULATION_WIFI_3_0 */
 #endif /* IPA_OFFLOAD */
 
 #ifndef FEATURE_WDS
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index aab8ef1a28..9da587fd90 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -1801,7 +1801,7 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt,
 	qdf_mem_free(freedesc);
 }
 
-#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
+#if defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86)
 /* Hawkeye emulation requires bus address to be >= 0x50000000 */
 static inline int dp_reo_desc_addr_chk(qdf_dma_addr_t dma_addr)
 {
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index 79aa0edd00..4b958d3b72 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -2013,7 +2013,6 @@ int hif_pci_bus_configure(struct hif_softc *hif_sc)
 	if (status)
 		goto disable_wlan;
 
-	/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
 	if (hif_needs_bmi(hif_osc)) {
 		status = hif_set_hia(hif_sc);
 		if (status)
diff --git a/hif/src/snoc/if_ahb.c b/hif/src/snoc/if_ahb.c
index dd345db983..49672a5b8a 100644
--- a/hif/src/snoc/if_ahb.c
+++ b/hif/src/snoc/if_ahb.c
@@ -605,7 +605,6 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
 	hif_register_tbl_attach(ol_sc, hif_type);
 	hif_target_register_tbl_attach(ol_sc, target_type);
 
-	/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
 	if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
 	    (tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
 	    (tgt_info->target_type != TARGET_TYPE_QCA6018)) {
@@ -624,7 +623,6 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
 
 	return QDF_STATUS_SUCCESS;
 err_target_sync:
-	/* QCA_WIFI_QCA8074_VP:Should not be executed on 8074 VP platform */
 	if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
 	    (tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
 	    (tgt_info->target_type != TARGET_TYPE_QCA6018)) {
diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c
index f51738f042..5628ef3cf1 100644
--- a/qdf/linux/src/qdf_mem.c
+++ b/qdf/linux/src/qdf_mem.c
@@ -1962,7 +1962,7 @@ static inline void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev,
 	return vaddr;
 }
 
-#elif defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86) && \
+#elif defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86) && \
 	!defined(QCA_WIFI_QCN9000)
 
 #define QCA8074_RAM_BASE 0x50000000
diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c
index 82836b7870..bfb02b6434 100644
--- a/qdf/linux/src/qdf_nbuf.c
+++ b/qdf/linux/src/qdf_nbuf.c
@@ -382,7 +382,7 @@ void __qdf_nbuf_count_dec(__qdf_nbuf_t nbuf)
 qdf_export_symbol(__qdf_nbuf_count_dec);
 #endif
 
-#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86) && \
+#if defined(CONFIG_WIFI_EMULATION_WIFI_3_0) && defined(BUILD_X86) && \
 	!defined(QCA_WIFI_QCN9000)
 struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve,
 				 int align, int prio, const char *func,