clean up some naming