Rename some things make their usage more clear.