KCINFR-979: replacing PD, Budget, and other references in s2s