Fix type and rename property.