Rename PrimaryMessage to PrimaryExceptionMessage, rename PrimaryTypeName to PrimaryExceptionTypeName.