adapt to new names