Diagram is updated

Shorter names, space-efficient arrange => should be more readble in the
paper.