Minor renaming refactors.