AddressBF & ContactBF became namepsaces and contain unnamed enums. This is for Solaris CC compatibility
-