Adapted to rename of field storage "name" property.