renamed some function conflicts