Tidy-up of DAG filename assignment