Refactor before rename.