Modify some variable names