fixed map
update the new names
fix merge conflicts
Merge pull request #16 from MissionBit/simran-merge

Simran merge