Renamed some things to be more correct.