Renamed DiagramParser to Parser