Fix comment and variable names after code review.