Fix some ambiguities in variable names and UI