Rename new macros to conform to naming rules (function macros have "Py" prefix, not "PY").