Update some terminology