Second round of renaming.