Minor API renaming