Also use the proper number of underscores for internal names. (Changing the names should be fine, since apparently the symbols are currently unused.)
Reviewed by: davidxu