Merge "Add missing naming policy for vFW_NextGen"