Switch to camelCase
Fix some errors