Completed Refactoring User Names and Captions