changed file names to be more consistent