Change some variable names