Making sure file names are correct after merge.

Closes #8
Closes #9