Some small API renaming.