Renamings.
Cleanups and shuffling.