[FIX] Terminology