Fix regression for new names.