Changed a few macro names for clarity.
Authored by: tswift 2016-01-17
Parent: [r8578]
Child: [r8580]