Minor refactorings in accessor names.