Refactored user names and captions
Refactored User Names and captions