rename properties for consistency