Issue #874 - Adopt DPF as xml file suffix