Follow-up r101808. Use canonical class name.