normalized some functions (their names) and removed a duplicate