Merge "Refactor PNF names in BPMN workflows"