r8477: handle new names