Rename macro

* Add functional Test
please use 2 spaces for indentation for xml files