5d81c27282
Change several variable names and update the macros. This commit was SVN r26851.
Change several variable names and update the macros. This commit was SVN r26851.