diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h
index b86b3fdb65..6cf85d87d9 100644
--- a/components/cfg/cfg_all.h
+++ b/components/cfg/cfg_all.h
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "wlan_policy_mgr_cfg.h"
+#include "cfg_policy_mgr.h"
 #include "cfg_define.h"
 #include "cfg_converged.h"
 #include "cfg_mlme.h"
@@ -25,13 +25,13 @@
 #include "cfg_ipa.h"
 
 #ifdef CONVERGED_P2P_ENABLE
-#include "wlan_p2p_cfg.h"
+#include "cfg_p2p.h"
 #else
 #define CFG_P2P_ALL
 #endif
 
 #ifdef FEATURE_WLAN_TDLS
-#include "wlan_tdls_cfg.h"
+#include "cfg_tdls.h"
 #else
 #define CFG_TDLS_ALL
 #endif
@@ -48,7 +48,7 @@
 #include "hdd_config.h"
 #include "hdd_dp_cfg.h"
 #include "cfg_legacy_dp.h"
-#include "wlan_cfg_dlm.h"
+#include "cfg_dlm.h"
 #include "cfg_pkt_capture.h"
 
 /* Maintain Alphabetic order here while adding components */
diff --git a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h b/components/cmn_services/policy_mgr/inc/cfg_policy_mgr.h
similarity index 99%
rename from components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h
rename to components/cmn_services/policy_mgr/inc/cfg_policy_mgr.h
index 068f3db36a..d2a5cb76ec 100644
--- a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h
+++ b/components/cmn_services/policy_mgr/inc/cfg_policy_mgr.h
@@ -34,7 +34,7 @@
  * If gWlainMccToSccSwitchMode = 2: Force switch with SAP restart.
  * If gWlainMccToSccSwitchMode = 3: Force switch without SAP restart.
  * If gWlainMccToSccSwitchMode = 4: Switch using
- * 					fav channel(s)without SAP restart.
+ *					fav channel(s)without SAP restart.
  * If gWlainMccToSccSwitchMode = 5: Force switch without SAP restart.MCC allowed
  *					in exceptional cases.
  * If gWlainMccToSccSwitchMode = 6: Force Switch without SAP restart only in
diff --git a/components/denylist_mgr/dispatcher/inc/wlan_cfg_dlm.h b/components/denylist_mgr/dispatcher/inc/cfg_dlm.h
similarity index 100%
rename from components/denylist_mgr/dispatcher/inc/wlan_cfg_dlm.h
rename to components/denylist_mgr/dispatcher/inc/cfg_dlm.h
diff --git a/components/p2p/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c
index dac2514674..a662bba328 100644
--- a/components/p2p/core/src/wlan_p2p_main.c
+++ b/components/p2p/core/src/wlan_p2p_main.c
@@ -35,7 +35,7 @@
 #include "wlan_p2p_main.h"
 #include "wlan_p2p_roc.h"
 #include "wlan_p2p_off_chan_tx.h"
-#include "wlan_p2p_cfg.h"
+#include "cfg_p2p.h"
 #include "cfg_ucfg_api.h"
 #include "wlan_mlme_api.h"
 
diff --git a/components/p2p/dispatcher/inc/wlan_p2p_cfg.h b/components/p2p/dispatcher/inc/cfg_p2p.h
similarity index 97%
rename from components/p2p/dispatcher/inc/wlan_p2p_cfg.h
rename to components/p2p/dispatcher/inc/cfg_p2p.h
index a0558abbdc..8a2292153c 100644
--- a/components/p2p/dispatcher/inc/wlan_p2p_cfg.h
+++ b/components/p2p/dispatcher/inc/cfg_p2p.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
diff --git a/components/tdls/dispatcher/inc/wlan_tdls_cfg.h b/components/tdls/dispatcher/inc/cfg_tdls.h
similarity index 99%
rename from components/tdls/dispatcher/inc/wlan_tdls_cfg.h
rename to components/tdls/dispatcher/inc/cfg_tdls.h
index 5b9c728993..5e6f7d97ab 100644
--- a/components/tdls/dispatcher/inc/wlan_tdls_cfg.h
+++ b/components/tdls/dispatcher/inc/cfg_tdls.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
diff --git a/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h b/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
index 5b5a61b0db..2bc1513d37 100644
--- a/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
+++ b/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
diff --git a/components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c b/components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c
index cab01a3cdf..c35140f4ab 100644
--- a/components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c
+++ b/components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -32,7 +33,7 @@
 #include <wlan_objmgr_cmn.h>
 #include "wlan_policy_mgr_api.h"
 #include "wlan_scan_ucfg_api.h"
-#include "wlan_tdls_cfg.h"
+#include "cfg_tdls.h"
 #include "cfg_ucfg_api.h"
 #include "wlan_tdls_api.h"