Changing map variables

Small variable changes