Improve naming conventions in display.h