Diagrams according to new naming convension.