Copmlete the symbol renaming to cover new symbols in the updated version. This commit was SVN r26486.
This commit was SVN r26431.