Fixing some terminology.