Change File Names, Also some fixes

I've also made the changes listed in 'Testing to Airlie' section on the
'Bugs and such' page on OneNote.