Rename macro

* Add functional Test
leftover