Change function names to fit other wrappers