Minor naming refactors.