Renaming and hygiene.