Fix: camel case problems