Merge "Fix BPMN activity name"