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

...he api versus the impl
cool, thanks.