Rename a couple of vaviables. (dm)