fixing some terminology