Fixing some terminology