Change some variable name to follow current variable name