Renamed to match class hierarchy