Tweak some variable names