Refactored user names and captions