modify some vars' name