Renamed beans etc