Minor refactoring for naming coherence