UVE name changes for consistency

Change-Id: I36de82d9ad4e8be949604287e0e8c6859d86a0bf
Merge "UVE name changes for consistency"