Merge "CSIT script changes for 'PNF' name refactoring"