Changes to be consistent with new diracsolver file names (dm names).