Change functions naming conventions
Change Error management