Snake case to camelcase, fixed errors