Rename project and macros to Macromap, other fixes