Improve naming and docs.