Fix some terminology