Reorder and fix macro add prefix