Some naming and comment edits.