Add name and value macros.