Update to UA terminology (bug 1027872)