Fixed some names following the recent changes.