Renamed ID to IDENTIFIER and some more minor changes.