Change naming of files to be consistent.