updated refactoring user names and captions