creating refactoring branch
Refactored user names and captions
Refactored user names and captions