More minor name refactoring.