Some variables got renamed the way the shouldn't. Doesn't have any functional impact but fix it for the sake of cosmetics.