Minor refactoring of names.