No, I haven't renamed it. The only thing I've changed was to make the test passing against 4.3 (basically the same as your mocking change in the master PR). The serialization discussion is left for master (as the interface split only is introduced in that other PR).