Change how goal name is found