Minor changes

Name changes.
Document changes.