Merge "Rename the default recipe for VFC NS"