Changed name to use underscore and rebuilt.

svn path=/sandbox/; revision=84011