ati: Some variable name changes.