macro naming clean up (was a copy&paste mistake from 30693). nw.