UVE name changes fixing a couple of places which were missed.