Rename properties and make other requested changes