Fixed out of place dfml name mapping