Missed renaming some variables