Some clean-up and renaming.