Started on renaming refactoring.