Update for renamed element APIs