rename in r63439. Also fix one occurrence of unichr() in html.parser.
includes merge of trunk revision 63432