Changed some more variable names.