Renaming the APIs in advance of switching to identifiers.