Minor API rearrangement/renaming