Some reorganization and renaming.