Refs #414. Improved naming consistency and clarification of a comment.