Rename macro

* Add functional Test
shouldn't be here, should be in parent