Rename: market_code and commodity_name