Rename M4 macros
Work around autoconf limitation