Updated naming convention for diagrams.