Safe call rename
clean
Fixed property increment
~~~
~