Correcting the variable names for the UI