diff --git a/src/os/inc/osapi-os-core.h b/src/os/inc/osapi-os-core.h
index ffb220dcf..2c5923b55 100644
--- a/src/os/inc/osapi-os-core.h
+++ b/src/os/inc/osapi-os-core.h
@@ -472,7 +472,7 @@ int32 OS_ConvertToArrayIndex   (osal_id_t object_id, uint32 *ArrayIndex);
  * @retval #OS_SUCCESS                 @copybrief OS_SUCCESS
  * @retval #OS_ERR_INCORRECT_OBJ_TYPE  @copybrief OS_ERR_INCORRECT_OBJ_TYPE
  * */
-int32 OS_ObjectIdToArrayIndex(uint32 idtype, osal_id_t id, uint32 *ArrayIndex);
+int32 OS_ObjectIdToArrayIndex(uint32 idtype, osal_id_t object_id, uint32 *ArrayIndex);
 
 
 
diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
index a82f2c6ec..528d0025a 100644
--- a/src/os/shared/src/osapi-idmap.c
+++ b/src/os/shared/src/osapi-idmap.c
@@ -1212,15 +1212,15 @@ int32 OS_GetResourceName(osal_id_t object_id, char *buffer, uint32 buffer_size)
  *           Otherwise OS_SUCCESS is returned.
  *
  *-----------------------------------------------------------------*/
-int32 OS_ObjectIdToArrayIndex(uint32 idtype, osal_id_t id, uint32 *ArrayIndex)
+int32 OS_ObjectIdToArrayIndex(uint32 idtype, osal_id_t object_id, uint32 *ArrayIndex)
 {
    uint32 max_id;
    uint32 obj_index;
    uint32 actual_type;
    int32 return_code;
 
-   obj_index = OS_ObjectIdToSerialNumber_Impl(id);
-   actual_type = OS_ObjectIdToType_Impl(id);
+   obj_index = OS_ObjectIdToSerialNumber_Impl(object_id);
+   actual_type = OS_ObjectIdToType_Impl(object_id);
 
    /*
     * If requested by the caller, enforce that the ID is of the correct type.