More refactoring for multi-word variable names.