Rename properties and revise text