Changed parameter names in UI components to be more intuitive