Changed the name of some files to better represent what is in them