Change functions name to be not ambiguous