fixup! Rename more files