Merge pull request #57 from google/rename_macro

Rename macros.