Change some more variable names