Rename macro

* Add functional Test
a single desc in the parent is enough IMO