Fixing variable names, from lowercase to camelcase