Refactor names.