Change variable names and typo