updating variable names to more meaningful ones like in m16
Variable names were different in azure-m16 and master branches, making changes in master with reference to the naming in azure-m16 as it has more meaning
Variable names were different in azure-m16 and master branches, making changes in master with reference to the naming in azure-m16 as it has more meaning