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

...he api versus the impl
At some point we may need to consolidate all of the Question ids in one place but perhaps we won't need to after the questionnaire refactor.