fix some terminology