Variables renamed to make more sense after changes