[FIX] Inconsistent naming