Minor naming/comment changes.