Rename properties for consistency.