File rename
Improve abstraction in LET-MACRO