Clean up documentation and naming.
5 files changed