Rename OnSubscribe subclasses to OnSubscribeXx

Trivial cleanup that replaces #62.