update some variable names