Name mapping file. Closes #14
Note mapping. Fixed Names and Sources. Closes #11