Change file names to be consistent