Part 7 of UU/UB changes

All UU/UB changes done--except for the exceptions noted in the other
updates :)