fixed new data name changes
fixed new data name changes