KCINFR-979: renaming attributes
KCINFR-979: unit api
Merge pull request #323 from leoherbie/s2s_pd_unit_api

KCINFR-979: S2s pd unit api