diff --git a/umac/regulatory/core/src/reg_opclass.c b/umac/regulatory/core/src/reg_opclass.c
index 5103c7bd5610..4074ef29902a 100644
--- a/umac/regulatory/core/src/reg_opclass.c
+++ b/umac/regulatory/core/src/reg_opclass.c
@@ -595,7 +595,7 @@ void reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 					chan_num);
 }
 
-bool reg_country_opclass_freq_check(struct wlan_objmgr_pdev *pdev,
+bool reg_is_freq_in_country_opclass(struct wlan_objmgr_pdev *pdev,
 				    const uint8_t country[3],
 				    uint8_t op_class,
 				    qdf_freq_t chan_freq)
diff --git a/umac/regulatory/core/src/reg_opclass.h b/umac/regulatory/core/src/reg_opclass.h
index da0f018a1960..fee2e488bc62 100644
--- a/umac/regulatory/core/src/reg_opclass.h
+++ b/umac/regulatory/core/src/reg_opclass.h
@@ -184,7 +184,7 @@ void reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 			       uint8_t *chan_num);
 
 /**
- * reg_country_opclass_freq_check() - check for frequency in (tbl, oper class)
+ * reg_is_freq_in_country_opclass() - check for frequency in (tbl, oper class)
  *
  * @pdev: pdev pointer
  * @country: country from country IE
@@ -193,7 +193,7 @@ void reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
  *
  * Return: bool
  */
-bool reg_country_opclass_freq_check(struct wlan_objmgr_pdev *pdev,
+bool reg_is_freq_in_country_opclass(struct wlan_objmgr_pdev *pdev,
 				    const uint8_t country[3],
 				    uint8_t op_class,
 				    qdf_freq_t chan_freq);
@@ -351,7 +351,7 @@ reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 }
 
 static inline bool
-reg_country_opclass_freq_check(struct wlan_objmgr_pdev *pdev,
+reg_is_freq_in_country_opclass(struct wlan_objmgr_pdev *pdev,
 			       const uint8_t country[3],
 			       uint8_t op_class,
 			       uint16_t chan_freq)
diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
index d10992c8057d..8ff3efadb7b9 100644
--- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
+++ b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
@@ -62,6 +62,11 @@
 #define REGULATORY_PHYMODE_NO11AC    BIT(4)
 #define REGULATORY_PHYMODE_NO11AX    BIT(5)
 
+#define BW_5_MHZ      5
+#define BW_10_MHZ     10
+#define BW_20_MHZ     20
+#define BW_25_MHZ     25
+#define BW_40_MHZ     40
 #define BW_80_MHZ     80
 #define BW_160_MHZ    160
 #define BW_40_MHZ     40
diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
index 584bea9bf0f8..49700f11dc8b 100644
--- a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
+++ b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
@@ -1218,7 +1218,7 @@ void wlan_reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 				    uint8_t *chan_num);
 
 /**
- * wlan_reg_country_opclass_freq_check() - checks frequency in (ctry, op class)
+ * wlan_reg_is_freq_in_country_opclass() - checks frequency in (ctry, op class)
  *                                         pair
  * @pdev: pdev ptr
  * @country: country information
@@ -1227,7 +1227,7 @@ void wlan_reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
  *
  * Return: bool
  */
-bool wlan_reg_country_opclass_freq_check(struct wlan_objmgr_pdev *pdev,
+bool wlan_reg_is_freq_in_country_opclass(struct wlan_objmgr_pdev *pdev,
 					 const uint8_t country[3],
 					 uint8_t op_class,
 					 qdf_freq_t chan_freq);
diff --git a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c
index 72f73709359c..99e56df8579b 100644
--- a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c
+++ b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c
@@ -1040,12 +1040,12 @@ void wlan_reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 					 chan_num);
 }
 
-bool wlan_reg_country_opclass_freq_check(struct wlan_objmgr_pdev *pdev,
+bool wlan_reg_is_freq_in_country_opclass(struct wlan_objmgr_pdev *pdev,
 					 const uint8_t country[3],
 					 uint8_t op_class,
 					 qdf_freq_t chan_freq)
 {
-	return reg_country_opclass_freq_check(pdev, country,
+	return reg_is_freq_in_country_opclass(pdev, country,
 					      op_class, chan_freq);
 }