clean up some data names