HDYRA-154: changes the var names tos omething mroe descriptive as per code review