Now diagrams are named correctly.