Modify some variable name