Rename DUMP to dump to make --target=mast work
Improve readability of --target=mast