Changed some names

Changed names of form and .vb file just to neaten it up a little.