KCINFR-979: repackaging some incorrect apis, repackaging s2s to denote t...

...he api versus the impl
I can't inject this because it is dynamic, however I think I can insulate this from breakages related to package refactoring.  I'll do that.