Refactored: update screen name