Renaming defines for consistency.

Renaming defines for consistency.