Renamed some things to be more consistent with other parts