Refactor screen name