*8212* Standardization in prep for move to PKP lib