new names and other changes