Change variable names to more meaning one