First wave of simple naming refactoring.