Renamed for vendor packaging