Changed names of files

Changed the names of some files to make them more descriptive