fix macro subnames