Renaming files to be more consistent.