Minor refactor for naming consistency.