Fix Solaris build issues with names that exist there.