Renamed SingleBet to BetOption and CompositeBet to GenericBet