Fix ChoosePaymentMethodType to work with 2.0
Change properties to protected to avoid a bug with some serializers