latest updates to handle consolidation of Identity::V2 to IdentityV2, etc.