Refactor display naming