Renamed to match code switch