Changed more variable names