More shuffling and renaming.