Rename macro

* Add functional Test
bad package nale, typo for hierarchy