I don't think we can change these binary-compatibly, but the current designations are causing all sorts of friction in #628.