diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index ec2f09773e..299c7c123e 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -342,7 +342,7 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data,
 				    bool is_link_up);
 
 QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
-				 struct tagCsrRoamInfo *roam_info,
+				 struct csr_roam_info *roam_info,
 				 uint8_t sta_id,
 				 struct qdf_mac_addr *peer_mac_addr,
 				 struct bss_description *bss_desc);
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index a21d212694..1ab0845045 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1374,7 +1374,7 @@ typedef struct tagCsrUpdateConfigParam {
 #define CSR_ROAM_AUTH_STATUS_AUTHENTICATED  0x2
 #endif
 
-typedef struct tagCsrRoamInfo {
+typedef struct csr_roam_info {
 	tCsrRoamProfile *pProfile;
 	tSirBssDescription *pBssDesc;
 	uint32_t nBeaconLength;
diff --git a/core/sme/inc/sme_nan_datapath.h b/core/sme/inc/sme_nan_datapath.h
index d8c3a0e18d..9b26d2e669 100644
--- a/core/sme/inc/sme_nan_datapath.h
+++ b/core/sme/inc/sme_nan_datapath.h
@@ -166,7 +166,7 @@ void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx,
 					uint32_t result,
 					uint32_t *roam_status,
 					uint32_t *roam_result,
-					struct tagCsrRoamInfo *roam_info);
+					struct csr_roam_info *roam_info);
 
 #else
 /* Start NDI BSS */
@@ -188,7 +188,7 @@ static inline void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx,
 					uint32_t result,
 					uint32_t *roam_status,
 					uint32_t *roam_result,
-					struct tagCsrRoamInfo *roam_info)
+					struct csr_roam_info *roam_info)
 {
 }