Use the new macro names.  Verbally approved by Ralph/RM.