fixup! 7a6a0a2

Update variable names from review.