Bunch of renaming and docs.
Slight simplification.