Renamed to be consistent with the recent spec changes