Exposed a display name field on WaterCatcher, use that instead of creating two new stub item definitions Delete CrudeOilProducer and WaterProducer items