[PLAT-3410] Reintroduced "Security" and "Trade" version of BondFutures. Rename some methods in visitor to be inline with class names.