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

...he api versus the impl
I don't even know why there is a 2 in the first place.  I'll get it to a constant though