Fixed bug related to chaning name of a property