fix names for screen defines.