2.0 changed some of the item class names for consistency. BP is affected by this as well. This does not need to be backported to master!