[FIX] Respect camelized naming convention