A few renames in OFFile.