Renamed bundle classes