Rename things for clarity.