More cleanup related to file renaming.