Minor update of variable names