Refactored user nmes and captions