Updated all function names to camelcase