MOdify variables name