[util] Renaming some files.