diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index ee114622978a..103514657291 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -209,7 +209,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 			    void *pModuleContext);
 
-QDF_STATUS cds_set_context(QDF_MODULE_ID moduleID, void *context);
+QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context);
 
 QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type,
 			      uint32_t *subType);
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 8edddecae199..e5cff3dcaf58 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -1119,10 +1119,10 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 
 /**
  * cds_set_context() - API to set context in global CDS Context
- * @moduleID: Module ID
+ * @module_id: Module ID
  * @context: Pointer to the Module Context
  *
- * API to set a MODULE Context in gloabl CDS Context
+ * API to set a MODULE Context in global CDS Context
  *
  * Return: QDF_STATUS
  */
@@ -1132,7 +1132,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context)
 
 	if (!p_cds_context) {
 		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
-			  "cds context is Invald");
+			  "cds context is Invalid");
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
@@ -1142,8 +1142,8 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context)
 		break;
 	default:
 		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Module ID %i does not have its context "
-			  "allocated by CDS", __func__, module_id);
+			  "%s: Module ID %i does not have its context managed by CDS",
+			  __func__, module_id);
 		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -1615,7 +1615,7 @@ void cds_trigger_recovery(void)
 
 	if (!wma_handle) {
 		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
-			"WMA context is invald!");
+			  "WMA context is invalid!");
 		return;
 	}
 
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index f9345755bcf1..4eb564b06809 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -143,32 +143,32 @@ static bool hdd_is_load_or_unload_in_progress(void *data)
 }
 
 /**
- * hdd_is_recovery_in_prgress() - API to query if recovery in progress
+ * hdd_is_recovery_in_progress() - API to query if recovery in progress
  * @data: Private Data
  *
  * Return: bool
  */
-static bool hdd_is_recovery_in_prgress(void *data)
+static bool hdd_is_recovery_in_progress(void *data)
 {
 	return cds_is_driver_recovering();
 }
 
 /**
- * hdd_hif_init_cds_callbacks() - API to initialize HIF callbacks
+ * hdd_hif_init_driver_state_callbacks() - API to initialize HIF callbacks
  * @data: Private Data
- * @cbk: callbacks
+ * @cbk: HIF Driver State callbacks
  *
  * HIF should be independent of CDS calls. Pass CDS Callbacks to HIF, HIF will
  * call the callbacks.
  *
  * Return: void
  */
-static void hdd_hif_init_cds_callbacks(void *data, struct hif_callbacks *cbk)
+static void hdd_hif_init_driver_state_callbacks(void *data,
+			struct hif_driver_state_callbacks *cbk)
 {
 	cbk->context = data;
 	cbk->set_recovery_in_progress = hdd_set_recovery_in_progress;
-	cbk->get_monotonic_boottime = cds_get_monotonic_boottime;
-	cbk->is_recovery_in_progress = hdd_is_recovery_in_prgress;
+	cbk->is_recovery_in_progress = hdd_is_recovery_in_progress;
 	cbk->is_load_unload_in_progress = hdd_is_load_or_unload_in_progress;
 	cbk->is_driver_unloading = hdd_is_driver_unloading;
 }
@@ -227,10 +227,10 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid,
 	int ret = 0;
 	struct hif_opaque_softc *hif_ctx;
 	qdf_device_t qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
-	struct hif_callbacks cbk;
+	struct hif_driver_state_callbacks cbk;
 	uint32_t mode = cds_get_conparam();
 
-	hdd_hif_init_cds_callbacks(dev, &cbk);
+	hdd_hif_init_driver_state_callbacks(dev, &cbk);
 
 	hif_ctx = hif_open(qdf_ctx, mode, bus_type, &cbk);
 	if (!hif_ctx) {