A little rename refactoring.