Minor name refactoring.