OCD renaming.