Simplifiny identifier types and putting sourceId and references into main NameUsage