Rename: market_code and commodity_name

and I also fixed the query.