Disambiguate two retree passes by renaming one to consolidate.
Create package identifiers.