Revert "Fixed name change behavior"

This reverts commit 953efe9ae5bc53215e42d12096cde0ecfcf60684.