APOLLO-3299 Updated validators to use pfa instead of pf