renamed some of the files so that they are consistent