Minor refactoring of variable names.