Refactoring user names and captions