clean up some terminology