MarketMakerMap renamed to TraderMap