[ent phys] More migration to new hacc