Modified some terminology