Rename Macro, fix small repl bug