Some reorganizing and renaming.