[petercooper]

To be fair, at this stage, supporting both is a bit like supporting both Python 2 and 3. The name change makes it seem bigger a split than it really is.