changed file names to be consistent