Restore constants to uppercase