All of these, as well as some other entries that were ambiguous, are nested inside an id now.