Merge "Program name adaptation for vndservice"