Update for new API naming