Changed filename calculation.
Changed dumps dir.