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

...he api versus the impl
but the path itself is not, is it? It is not a big deal, was just curious.