Tweak variable names