Fixed some terminology