Refactor and name change.