Update paths to new macros