(refactor) changed api names