Refactor code after rename.