Minor name changes and edits.