modify some column names,move DataProviderPlace into DataProvider