Updated api for consistency and change in terminology