Rename macro

* Add functional Test
shouldn't this be on the same line as above?