Cleaning up a bunch of stuff (again)
Change to the file names