Minor refactoring of names