Add some renames for more clarity.