Rewrite all diagram png names. Closes #557