Simplify diagram names