refactoring of names from 'Default' to 'MarketData'