Tweak variable names.