Rename enum entries to avoid macros on Solaris. #4588