Rename the badly named UserDB.
More code tidying.