Refactored user names and captions
Refactored user names and captions 2
Merge branch 'refactoring'