Switch from GFW to VFW name convention