[FIX] Confusing naming schemes