Change functons names