Escape hyphens in VG name, too [Closes: GH#25]