And change the names of these variables, too.