Rename properties to better tell their story