Update api to reflect change from core => lib