rename properties
rename properties
adjust to renamed properties.