Some additional file renaming.