EMBRYO-129: based on name instead of schedule