rename file and add Andrew 0002 HAVE_DV patch