3 files changed, 11 insertions, 10 deletions
diff --git a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c b/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
index f919afe..77ae52f 100644
--- a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
+++ b/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
@@ -77,7 +77,7 @@ void HalMgrLoaded(afb_req_t request)
 		return;
 	}
 
-	currentHalData = HalMgrGlobalData->first;
+	currentHalData = HalMgrGlobalData->halDataList;
 
 	if(! currentHalData) {
 		afb_req_success(request, NULL, "No Hal Api loaded");
@@ -174,7 +174,7 @@ void HalMgrLoad(afb_req_t request)
 		return;
 	}
 
-	addedHal = HalUtlAddHalApiToHalList(&HalMgrGlobalData->first);
+	addedHal = HalUtlAddHalApiToHalList(&HalMgrGlobalData->halDataList);
 
 	addedHal->internal = 0;
 	// TBD JAI : initialize external to unavailable once event from external hal will be handled
@@ -232,7 +232,8 @@ void HalMgrUnload(afb_req_t request)
 		return;
 	}
 
-	if(! (HalToRemove = HalUtlSearchHalDataByApiName(&HalMgrGlobalData->first, apiName))) {
+	HalToRemove = HalUtlSearchHalDataByApiName(&HalMgrGlobalData->halDataList, apiName);
+	if(! HalToRemove) {
 		afb_req_fail(request, "requested_api", "Can't find api to remove");
 		return;
 	}
@@ -242,7 +243,7 @@ void HalMgrUnload(afb_req_t request)
 		return;
 	}
 
-	if(HalUtlRemoveSelectedHalFromList(&HalMgrGlobalData->first, HalToRemove)) {
+	if(HalUtlRemoveSelectedHalFromList(&HalMgrGlobalData->halDataList, HalToRemove)) {
 		afb_req_fail(request, "unregister_error", "Didn't succeed to remove specified api");
 		return;
 	}
diff --git a/4a-hal/4a-hal-manager/4a-hal-manager.c b/4a-hal/4a-hal-manager/4a-hal-manager.c
index 75177e7..017199f 100644
--- a/4a-hal/4a-hal-manager/4a-hal-manager.c
+++ b/4a-hal/4a-hal-manager/4a-hal-manager.c
@@ -54,13 +54,13 @@ afb_verb_t HalManagerApiStaticVerbs[] =
 };
 
 /*******************************************************************************
- *		HAL Manager get first 'SpecificHalData' structure	       *
+ *		HAL Manager get 'SpecificHalData' linked list		       *
 		from HAL list function					       *
  ******************************************************************************/
 
-struct SpecificHalData **HalMngGetFirstHalData(void)
+struct SpecificHalData **HalMngGetHalDataList(void)
 {
-	return &localHalMgrGlobalData.first;
+	return &localHalMgrGlobalData.halDataList;
 }
 
 /*******************************************************************************
@@ -85,7 +85,7 @@ static int HalMgrInitApi(afb_api_t apiHandle)
 	if(HalUtlInitializeHalMgrData(apiHandle, HalMgrGlobalData, HAL_MANAGER_API_NAME, HAL_MANAGER_API_INFO))
 		return -3;
 
-	currentCtlHalData = HalMgrGlobalData->first;
+	currentCtlHalData = HalMgrGlobalData->halDataList;
 
 	while(currentCtlHalData) {
 		if(! currentCtlHalData->apiName)
diff --git a/4a-hal/4a-hal-manager/4a-hal-manager.h b/4a-hal/4a-hal-manager/4a-hal-manager.h
index 9749edc..b9eabba 100644
--- a/4a-hal/4a-hal-manager/4a-hal-manager.h
+++ b/4a-hal/4a-hal-manager/4a-hal-manager.h
@@ -23,7 +23,7 @@
 #define HAL_MANAGER_API_NAME "4a-hal-manager"
 #define HAL_MANAGER_API_INFO "Manager for 4A HAL APIs"
 
-// HAL Manager get first 'SpecificHalData' structure from HAL list function
-struct SpecificHalData **HalMngGetFirstHalData(void);
+// HAL Manager get 'SpecificHalData' linked list
+struct SpecificHalData **HalMngGetHalDataList(void);
 
 #endif /* _HALMGR_BINDING_INCLUDE_ */
 \ No newline at end of file