Changed some class names on ClassDiagram