Refactor name from value to screen