clean up terminology