Renamed some things according to MIDI XML
Type check