User list class/function names renamed to be more specific