you are right... looks like pretty much all of E2 is now E3, and they split, e1 and e0 into e0, e1, and E2