Fixes for nested workflows with duplicate names