Cherry pick from c3569862dc: Fix couple misnamed calls