Fixed functions change name and camelcase